From 71b1d5fef18fd941d641898566ce45b985b827d7 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Sun, 5 Jun 2016 15:08:03 +0800
Subject: [PATCH] Bump version

---
 src/main/AndroidManifest.xml           | 4 ++--
 src/main/jni/Android.mk                | 2 ++
 src/main/jni/shadowsocks-libev         | 2 +-
 src/main/res/values-ru/strings.xml     | 2 +-
 src/main/res/values-zh-rCN/strings.xml | 2 +-
 src/main/res/values-zh/strings.xml     | 2 +-
 src/main/res/values/strings.xml        | 2 +-
 7 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 4803dc53..7a19ccc7 100644
--- 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="136"
-          android:versionName="2.10.3">
+          android:versionCode="137"
+          android:versionName="2.10.4">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/src/main/jni/Android.mk b/src/main/jni/Android.mk
index 43765fdb..5b2b62d7 100755
--- a/src/main/jni/Android.mk
+++ b/src/main/jni/Android.mk
@@ -386,6 +386,7 @@ LOCAL_MODULE    := ss-local
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
+					-DCONNECT_IN_PROGRESS=EINPROGRESS \
 					-I$(LOCAL_PATH)/include \
 					-I$(LOCAL_PATH)/libev \
 					-I$(LOCAL_PATH)/libancillary \
@@ -414,6 +415,7 @@ LOCAL_MODULE    := ss-tunnel
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
 LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
 					-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \
+					-DCONNECT_IN_PROGRESS=EINPROGRESS \
 					-I$(LOCAL_PATH)/libev \
 					-I$(LOCAL_PATH)/libancillary \
 					-I$(LOCAL_PATH)/include \
diff --git a/src/main/jni/shadowsocks-libev b/src/main/jni/shadowsocks-libev
index 0d64f11f..fd422008 160000
--- a/src/main/jni/shadowsocks-libev
+++ b/src/main/jni/shadowsocks-libev
@@ -1 +1 @@
-Subproject commit 0d64f11f47366a23397c96447ae1e22ead1781bb
+Subproject commit fd422008b748664c8b5dee8dd6233193a83f2869
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 82bac05a..42160fdb 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -39,7 +39,7 @@
   <string name="ipv6">IPv6 Маршрут</string>
   <string name="ipv6_summary">Перенаправлять IPv6 траффик на удалённый сервер</string>
   <string name="onetime_auth">Единоразовая Аутентификация</string>
-  <string name="onetime_auth_summary">Включить единоразовую аутентификацию (Экспериментальная функция)</string>
+  <string name="onetime_auth_summary">Включить единоразовую аутентификацию</string>
   <string name="http_proxy">HTTP Прокси</string>
   <string name="http_proxy_summary">Локальный HTTP прокси</string>
   <string name="dns_proxy">DNS Прокси</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index e26c12ec..f25505d4 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -73,7 +73,7 @@
   <string name="udp_dns_summary">由远程服务器转发 UDP 协议的数据包</string>
 
   <string name="onetime_auth">一次性认证</string>
-  <string name="onetime_auth_summary">启用一次性认证（实验性）</string>
+  <string name="onetime_auth_summary">启用一次性认证</string>
 
   <string name="ipv6">IPv6 路由</string>
   <string name="ipv6_summary">向远程服务器转发 IPv6 流量</string>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh/strings.xml
index 3cec6ab6..5d32b4e6 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh/strings.xml
@@ -74,7 +74,7 @@
   <string name="udp_dns_summary">向遠端轉送 UDP 封包</string>
 
   <string name="onetime_auth">單次驗證</string>
-  <string name="onetime_auth_summary">啟用單次驗證 (試驗性)</string>
+  <string name="onetime_auth_summary">啟用單次驗證</string>
 
   <string name="ipv6">IPv6 路由</string>
   <string name="ipv6_summary">向遠端重新導向 IPv6 流量</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index bac91e4c..62286d4f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -43,7 +43,7 @@
   <string name="ipv6">IPv6 Route</string>
   <string name="ipv6_summary">Redirect IPv6 traffic to remote</string>
   <string name="onetime_auth">One-time Authentication</string>
-  <string name="onetime_auth_summary">Enable one-time authentication (Experimental)</string>
+  <string name="onetime_auth_summary">Enable one-time authentication</string>
   <string name="http_proxy">HTTP Proxy</string>
   <string name="http_proxy_summary">Local HTTP Proxy</string>
   <string name="dns_proxy">DNS Proxy</string>