Fix #871

shadowsocks · Sep 9, 2016 · e3f0fa6 · e3f0fa6
1 parent 35cb273
commit e3f0fa6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="152"
-          android:versionName="3.1.1">
+          android:versionCode="153"
+          android:versionName="3.1.2">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev
+1 −1		.uncrustify.cfg
+21 −0		configure
+1 −0		m4/pcre.m4
+35 −24		src/acl.c
+4 −2		src/android.c
+13 −7		src/cache.c
+75 −42		src/encrypt.c
+17 −8		src/http.c
+8 −4		src/jconf.c
+24 −15		src/json.c
+4 −2		src/json.h
+69 −44		src/local.c
+46 −29		src/manager.c
+21 −12		src/netutils.c
+1 −1		src/protocol.h
+40 −24		src/redir.c
+31 −17		src/resolv.c
+26 −10		src/rule.c
+0 −2		src/rule.h
+59 −34		src/server.c
+43 −31		src/tls.c
+32 −16		src/tunnel.c
+50 −28		src/udprelay.c
+20 −11		src/utils.c
+1 −1		src/utils.h
+12 −6		src/win32.c