merge upstream v4.20-9608-rtm

src/Cedar/Cedar.h

@@ -135,10 +135,10 @@
 
 
 // Version number
-#define	CEDAR_VER					419
+#define	CEDAR_VER					420
 
 // Build Number
-#define	CEDAR_BUILD					9605
+#define	CEDAR_BUILD					9608
 
 // Beta number
 //#define	BETA_NUMBER					3
@@ -158,11 +158,11 @@
 
 // Specifies the build date
 #define	BUILD_DATE_Y		2016
-#define	BUILD_DATE_M		3
-#define	BUILD_DATE_D		6
+#define	BUILD_DATE_M		4
+#define	BUILD_DATE_D		17
 #define	BUILD_DATE_HO		20
-#define	BUILD_DATE_MI		11
-#define	BUILD_DATE_SE		13
+#define	BUILD_DATE_MI		58
+#define	BUILD_DATE_SE		26
 
 // Tolerable time difference
 #define	ALLOW_TIMESTAMP_DIFF		(UINT64)(3 * 24 * 60 * 60 * 1000)

src/CurrentBuild.txt

@@ -1,4 +1,4 @@
-BUILD_NUMBER 9605
-VERSION 419
-BUILD_NAME beta
-BUILD_DATE 20160306_201113
+BUILD_NUMBER 9608
+VERSION 420
+BUILD_NAME rtm
+BUILD_DATE 20160417_205826

src/bin/hamcore/strtable_en.stb

@@ -233,7 +233,7 @@ TCPOPT_NOT_ADMIN		Users without administrator privileges cannot use the TCP Opti
 
 # Windows Vista / Windows 7 / Windows 8 Optimization
 VISTA_MMCSS_MSG			Do you wish to optimize Windows Vista / Windows 7 / Windows 8 / Windows 10 for playing multimedia files with VPN? (e.g. videos, audios and streaming)
-VISTA_MMCSS_MSG_2		Optimization for Windows Vista / Windows 7 / Windows 8 / Windows 10 with VPN has already done.\r\nDo you wish to remote optimized configuration?
+VISTA_MMCSS_MSG_2		Optimization for Windows Vista / Windows 7 / Windows 8 / Windows 10 with VPN has already done.\r\nDo you wish to remove optimized configuration?
 VISTA_MMCSS_MSG_3		You cannot use optimization in currently environment.
 VISTA_MMCSS_MSG_4		You must have administrator privileges for this function.\r\nPlease note that in Windows Vista / Windows 7 / Windows 8 / Windows 10 you should use "Run as Administrators" to execute program.
 VISTA_MMCSS_MSG_5		Optimization is finished.

src/vpnweb/vpnweb.h

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Mar 06 20:11:25 2016
+/* at Sun Apr 17 20:58:41 2016
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)

src/vpnweb/vpnweb_i.c

@@ -6,7 +6,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Mar 06 20:11:25 2016
+/* at Sun Apr 17 20:58:41 2016
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)

src/vpnweb/vpnweb_p.c

@@ -4,7 +4,7 @@
 
 
  /* File created by MIDL compiler version 7.00.0500 */
-/* at Sun Mar 06 20:11:25 2016
+/* at Sun Apr 17 20:58:41 2016
  */
 /* Compiler settings for .\vpnweb.idl:
     Oicf, W1, Zp8, env=Win32 (32b run)