update privoxy to 3.0.28

binary modified via OD with tray icon function calls bypassed

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>

shadowsocks-csharp/Controller/Service/PrivoxyRunner.cs

@@ -30,7 +30,6 @@ namespace Shadowsocks.Controller
                 _privoxyJob = new Job();
 
                 FileManager.UncompressFile(Utils.GetTempPath("ss_privoxy.exe"), Resources.privoxy_exe);
-                FileManager.UncompressFile(Utils.GetTempPath("mgwz.dll"), Resources.mgwz_dll);
             }
             catch (IOException e)
             {

shadowsocks-csharp/Properties/Resources.Designer.cs

@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     此代码由工具生成。
-//     运行时版本:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     对此文件的更改可能会导致不正确的行为，并且如果
-//     重新生成代码，这些更改将会丢失。
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -13,12 +13,12 @@ namespace Shadowsocks.Properties {
     
     
     /// <summary>
-    ///   一个强类型的资源类，用于查找本地化的字符串等。
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
-    // 此类是由 StronglyTypedResourceBuilder
-    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
-    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
-    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -33,7 +33,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   返回此类使用的缓存的 ResourceManager 实例。
+        ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   使用此强类型资源类，为所有资源查找
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
         internal static byte[] abp_js {
             get {
@@ -71,7 +71,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找类似 # translation for Japanese
+        ///   Looks up a localized string similar to # translation for Japanese
         ///
         ///Shadowsocks=Shadowsocks
         ///
@@ -86,13 +86,13 @@ namespace Shadowsocks.Properties {
         ///Statistics Config...=統計情報の設定...
         ///Start on Boot=システムと同時に起動
         ///Forward Proxy...=フォワードプロキシの設定...
-        ///Allow Clients from LAN=LAN からのアクセスを許可
+        ///Allow other Devices to connect=他のデバイスからの接続を許可する
         ///Local PAC=ローカル PAC
         ///Online PAC=オンライン PAC
         ///Edit Local PAC File...=ローカル PAC ファイルの編集...
         ///Update Local PAC from GFWList=GFWList からローカル PAC を更新
         ///Edit User Rule for GFWList...=ユーザールールの編集...
-        ///Secure Local  [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///Sec [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string ja {
             get {
@@ -101,7 +101,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
         internal static byte[] libsscrypto_dll {
             get {
@@ -111,24 +111,14 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] mgwz_dll {
-            get {
-                object obj = ResourceManager.GetObject("mgwz_dll", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 listen-address __PRIVOXY_BIND_IP__:__PRIVOXY_BIND_PORT__
+        ///   Looks up a localized string similar to listen-address __PRIVOXY_BIND_IP__:__PRIVOXY_BIND_PORT__
         ///toggle 0
         ///logfile ss_privoxy.log
         ///show-on-task-bar 0
         ///activity-animation 0
         ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
         ///hide-console
-        /// 的本地化字符串。
+        ///.
         /// </summary>
         internal static string privoxy_conf {
             get {
@@ -137,7 +127,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
         internal static byte[] privoxy_exe {
             get {
@@ -147,7 +137,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
         internal static byte[] proxy_pac_txt {
             get {
@@ -157,7 +147,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ss16 {
             get {
@@ -167,7 +157,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ss20 {
             get {
@@ -177,7 +167,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ss24 {
             get {
@@ -187,7 +177,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ssIn24 {
             get {
@@ -197,7 +187,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ssOut24 {
             get {
@@ -207,7 +197,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap ssw128 {
             get {
@@ -217,7 +207,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
         internal static byte[] sysproxy_exe {
             get {
@@ -227,7 +217,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
+        ///   Looks up a localized resource of type System.Byte[].
         /// </summary>
         internal static byte[] sysproxy64_exe {
             get {
@@ -237,9 +227,9 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找类似 ! Put user rules line by line in this file.
+        ///   Looks up a localized string similar to ! Put user rules line by line in this file.
         ///! See https://adblockplus.org/en/filter-cheatsheet
-        /// 的本地化字符串。
+        ///.
         /// </summary>
         internal static string user_rule {
             get {
@@ -248,7 +238,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找类似 # translation for Simplified Chinese
+        ///   Looks up a localized string similar to # translation for Simplified Chinese
         ///
         ///Shadowsocks=Shadowsocks
         ///
@@ -263,14 +253,13 @@ namespace Shadowsocks.Properties {
         ///Statistics Config...=统计配置...
         ///Start on Boot=开机启动
         ///Forward Proxy...=正向代理设置...
-        ///Allow Clients from LAN=允许来自局域网的连接
+        ///Allow other Devices to connect=允许其他设备连入
         ///Local PAC=使用本地 PAC
         ///Online PAC=使用在线 PAC
         ///Edit Local PAC File...=编辑本地 PAC 文件...
         ///Update Local PAC from GFWList=从 GFWList 更新本地 PAC
         ///Edit User Rule for GFWList...=编辑 GFWList 的用户规则...
-        ///Secure Local PAC=保护本地 PAC
-        ///Cop [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///Secure Local PAC=保护本地 PA [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string zh_CN {
             get {
@@ -279,7 +268,7 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找类似 # translation for Traditional Chinese
+        ///   Looks up a localized string similar to # translation for Traditional Chinese
         ///
         ///Shadowsocks=Shadowsocks
         ///
@@ -294,13 +283,13 @@ namespace Shadowsocks.Properties {
         ///Statistics Config...=統計設定檔...
         ///Start on Boot=開機啟動
         ///Forward Proxy...=正向 Proxy 設定...
-        ///Allow Clients from LAN=允許來自區域網路的連線
+        ///Allow other Devices to connect=允許其他裝置連入
         ///Local PAC=使用本機 PAC
         ///Online PAC=使用線上 PAC
         ///Edit Local PAC File...=編輯本機 PAC 檔案...
         ///Update Local PAC from GFWList=從 GFWList 更新本機 PAC
         ///Edit User Rule for GFWList...=編輯 GFWList 的使用者規則...
-        ///Secure Local PAC=安全本機 [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///Secure Local PAC [rest of string was truncated]&quot;;.
         /// </summary>
         internal static string zh_TW {
             get {

shadowsocks-csharp/Properties/Resources.resx

@@ -127,9 +127,6 @@
   <data name="libsscrypto_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Data\libsscrypto.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="mgwz_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\data\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="privoxy_conf" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\data\privoxy_conf.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>

shadowsocks-csharp/shadowsocks-csharp.csproj

@@ -255,7 +255,6 @@
     </None>
     <None Include="Data\abp.js.gz" />
     <None Include="Data\libsscrypto.dll.gz" />
-    <None Include="Data\mgwz.dll.gz" />
     <None Include="Data\privoxy.exe.gz" />
     <None Include="Data\proxy.pac.txt.gz" />
   </ItemGroup>