Merge branch 'hotfix/1.2.2'

lparam · Sep 17, 2015 · 45ceab9 · 45ceab9
2 parents aeab675 + 2607126
commit 45ceab9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,8 @@
+v1.2.2 (2015-9-16)
+-----------
+* Hotfix: crypto initialization
+
+
 v1.2.1 (2015-9-12)
 -----------
 * Change: update 3rd library to latest
@@ -7,7 +12,7 @@ v1.2.1 (2015-9-12)
 
 v1.2.0 (2015-6-07)
 -----------
-* Change: json instead of realm for profile store 
+* Change: json instead of realm for profile store
 * Change: Remove libsuperuser
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         minSdkVersion 18
         targetSdkVersion 22
         versionCode 120
-        versionName '1.2.1'
+        versionName '1.2.2'
     }
     lintOptions {
         abortOnError true

diff --git a/jni/xsocks b/jni/xsocks
+1 −1		3rd/libsodium
+1 −1		3rd/libuv
+15 −0		CHANGES.md
+1 −1		Makefile
+41 −25		README.md
+1 −1		openwrt/Makefile
+3 −3		src/cache.h
+4 −4		src/common.h
+8 −4		src/daemon.c
+3 −3		src/daemon.h
+3 −7		src/getopt-win.h
+3 −3		src/logger.h
+3 −3		src/packet.h
+3 −3		src/resolver.h
+3 −3		src/socks.h
+3 −3		src/udprelay.h
+3 −3		src/util.h
+2 −2		src/xforwarder.c
+3 −3		src/xforwarder.h
+2 −2		src/xsocks.c
+3 −3		src/xsocks.h
+2 −2		src/xsocksd.c
+3 −3		src/xsocksd.h
+2 −2		src/xtproxy.c
+3 −3		src/xtproxy.h
+4 −4		src/xtunnel.c
+3 −3		src/xtunnel.h