Commit 71b1d5fe authored by Max Lv's avatar Max Lv

Bump version

parent 5afb8b9c
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks" xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
android:versionCode="136" android:versionCode="137"
android:versionName="2.10.3"> android:versionName="2.10.4">
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
......
...@@ -386,6 +386,7 @@ LOCAL_MODULE := ss-local ...@@ -386,6 +386,7 @@ LOCAL_MODULE := ss-local
LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES)) LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_LOCAL \
-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \ -DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H \
-DCONNECT_IN_PROGRESS=EINPROGRESS \
-I$(LOCAL_PATH)/include \ -I$(LOCAL_PATH)/include \
-I$(LOCAL_PATH)/libev \ -I$(LOCAL_PATH)/libev \
-I$(LOCAL_PATH)/libancillary \ -I$(LOCAL_PATH)/libancillary \
...@@ -414,6 +415,7 @@ LOCAL_MODULE := ss-tunnel ...@@ -414,6 +415,7 @@ LOCAL_MODULE := ss-tunnel
LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES)) LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \ LOCAL_CFLAGS := -Wall -O2 -fno-strict-aliasing -DMODULE_TUNNEL \
-DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \ -DUSE_CRYPTO_OPENSSL -DANDROID -DHAVE_CONFIG_H -DSSTUNNEL_JNI \
-DCONNECT_IN_PROGRESS=EINPROGRESS \
-I$(LOCAL_PATH)/libev \ -I$(LOCAL_PATH)/libev \
-I$(LOCAL_PATH)/libancillary \ -I$(LOCAL_PATH)/libancillary \
-I$(LOCAL_PATH)/include \ -I$(LOCAL_PATH)/include \
......
Subproject commit 0d64f11f47366a23397c96447ae1e22ead1781bb Subproject commit fd422008b748664c8b5dee8dd6233193a83f2869
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<string name="ipv6">IPv6 Маршрут</string> <string name="ipv6">IPv6 Маршрут</string>
<string name="ipv6_summary">Перенаправлять IPv6 траффик на удалённый сервер</string> <string name="ipv6_summary">Перенаправлять IPv6 траффик на удалённый сервер</string>
<string name="onetime_auth">Единоразовая Аутентификация</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">HTTP Прокси</string>
<string name="http_proxy_summary">Локальный HTTP прокси</string> <string name="http_proxy_summary">Локальный HTTP прокси</string>
<string name="dns_proxy">DNS Прокси</string> <string name="dns_proxy">DNS Прокси</string>
......
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<string name="udp_dns_summary">由远程服务器转发 UDP 协议的数据包</string> <string name="udp_dns_summary">由远程服务器转发 UDP 协议的数据包</string>
<string name="onetime_auth">一次性认证</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">IPv6 路由</string>
<string name="ipv6_summary">向远程服务器转发 IPv6 流量</string> <string name="ipv6_summary">向远程服务器转发 IPv6 流量</string>
......
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<string name="udp_dns_summary">向遠端轉送 UDP 封包</string> <string name="udp_dns_summary">向遠端轉送 UDP 封包</string>
<string name="onetime_auth">單次驗證</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">IPv6 路由</string>
<string name="ipv6_summary">向遠端重新導向 IPv6 流量</string> <string name="ipv6_summary">向遠端重新導向 IPv6 流量</string>
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<string name="ipv6">IPv6 Route</string> <string name="ipv6">IPv6 Route</string>
<string name="ipv6_summary">Redirect IPv6 traffic to remote</string> <string name="ipv6_summary">Redirect IPv6 traffic to remote</string>
<string name="onetime_auth">One-time Authentication</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">HTTP Proxy</string>
<string name="http_proxy_summary">Local HTTP Proxy</string> <string name="http_proxy_summary">Local HTTP Proxy</string>
<string name="dns_proxy">DNS Proxy</string> <string name="dns_proxy">DNS Proxy</string>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment