update shadowsocks

src/main/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="98"
+    android:versionCode="99"
-    android:versionName="2.6.0">
+    android:versionName="2.6.1">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala

@@ -265,7 +265,7 @@ class ShadowsocksNatService extends Service with BaseService {
       val reject = ConfigUtils.getRejectList(getContext, application)
       val blackList = ConfigUtils.getBlackList(getContext, application)
       ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "127.0.0.1", 8153,
-        Path.BASE + "pdnsd-nat.pid", reject, blackList, reject, blackList, 8163)
+        Path.BASE + "pdnsd-nat.pid", reject, blackList, 8163)
     } else {
       ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "127.0.0.1", 8153,
         Path.BASE + "pdnsd-nat.pid", 8163)

src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala

@@ -157,7 +157,7 @@ class ShadowsocksVpnService extends VpnService with BaseService {
         val reject = ConfigUtils.getRejectList(getContext, application)
         val blackList = ConfigUtils.getBlackList(getContext, application)
         ConfigUtils.PDNSD_DIRECT.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153,
-          Path.BASE + "pdnsd-vpn.pid", reject, blackList, reject, blackList, 8163)
+          Path.BASE + "pdnsd-vpn.pid", reject, blackList, 8163)
       } else {
         ConfigUtils.PDNSD_LOCAL.formatLocal(Locale.ENGLISH, "0.0.0.0", 8153,
           Path.BASE + "pdnsd-vpn.pid", 8163)

src/main/scala/com/github/shadowsocks/utils/ConfigUtils.scala

@@ -168,20 +168,6 @@ object ConfigUtils {
       |}
       |
       |server {
-      | label= "secure";
-      | port = 443;
-      | ip = 208.67.220.220,113.20.8.17,77.66.84.233,176.56.237.171;
-      | timeout = 3;
-      | reject = %s;
-      | reject_policy = fail;
-      | reject_recursively = on;
-      | exclude = %s;
-      | policy = included;
-      | uptest = none;
-      | preset = on;
-      |}
-      |
-      |server {
       | label = "local-server";
       | ip = 127.0.0.1;
       | port = %d;