Merge pull request #1 from shadowsocks/master

合并主分支代码

CHANGES

@@ -1,3 +1,6 @@
+2.5.4 2015-08-16
+- Hide Privoxy icon
+
 2.5.3 2015-08-16
 - Replace Polipo with Privoxy
 - Add Choose by Total Packet Loss

README.md

@@ -16,8 +16,6 @@ Shadowsocks for Windows
 
 Download a [latest release].
 
-Notice: .Net 2.0 doesn't work well on Windows 10. We no longer support .Net 2.0. Both Shadowsocks-win-xxx.zip and Shadowsocks-win-dotnet4.0-xxx.zip are exactly the same file now. If you use Windows XP or 7, please install .Net 4.0 or higher.
-
 #### Basic
 
 1. Find Shadowsocks icon in the notification tray

shadowsocks-csharp/Controller/Service/UpdateChecker.cs

@@ -18,7 +18,7 @@ namespace Shadowsocks.Controller
         public string LatestVersionURL;
         public event EventHandler NewVersionFound;
 
-        public const string Version = "2.5.3";
+        public const string Version = "2.5.4";
 
         public void CheckUpdate(Configuration config)
         {