Merge branch 'hotfix/1.2.2'

lparam · lparam · commit 45ceab97e04e · 2015-09-17T15:02:45.000+08:00
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 @@
-Subproject commit 8b84f1c7a0c7d6f3b35b008ddf89b1a72e6957c8
+Subproject commit 89aac04feb3700cdd2109ee9e59e5a06b74fd91d
