October 2017 - tor-commits - lists.torproject.org

[orbot/master] update to latest meek amazon bridge:
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 2bd5614210ac37e1316e3dfaec3cc215abc98b9a Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 16 23:35:41 2017 -0400 update to latest meek amazon bridge: https://trac.torproject.org/projects/tor/ticket/21918 --- orbotservice/src/main/assets/bridges.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orbotservice/src/main/assets/bridges.txt b/orbotservice/src/main/assets/bridges.txt index bb194a30..fc831667 100644 --- a/orbotservice/src/main/assets/bridges.txt +++ b/orbotservice/src/main/assets/bridges.txt @@ -18,5 +18,5 @@ obfs4 154.35.22.12:4304 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXX obfs4 154.35.22.13:16815 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1 obfs4 85.17.30.79:443 FC259A04A328A07FED1413E9FC6526530D9FD87A cert=RutxZlu8BtyP+y0NX7bAVD41+J/qXNhHUrKjFkRSdiBAhIHIQLhKQ2HxESAKZprn/lR3KA iat-mode=0 -meek_lite 0.0.2.0:1 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com -meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com \ No newline at end of file +meek_lite 0.0.2.0:1 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2cly7j4zqgua7.cloudfront.net/ front=a0.awsstatic.com +meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com

1 0

[orbot/master] make sure receiver unregisters when destroyed
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit b322e530da659d714dc28679b158c3ed8fee8d7b Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 16 23:36:14 2017 -0400 make sure receiver unregisters when destroyed --- .../java/org/torproject/android/service/TorService.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 597e59e2..36c1b229 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -428,6 +428,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon @Override public void onDestroy() { + try { + unregisterReceiver(mNetworkStateReceiver); + } + catch (IllegalArgumentException iae) + { + //not registered yet + } + stopTor(); /** @@ -476,13 +484,7 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon clearNotifications(); sendCallbackStatus(STATUS_OFF); - try { - unregisterReceiver(mNetworkStateReceiver); - } - catch (IllegalArgumentException iae) - { - //not registered yet - } + } private void killAllDaemons() throws Exception {

1 0

[orbot/master] update about layout to show obfs4proxy
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit a5015dc691cfe4a07c4f583ab4bb439d8ce2ec05 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 16 23:36:47 2017 -0400 update about layout to show obfs4proxy --- app/src/main/res/layout/layout_about.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/layout_about.xml b/app/src/main/res/layout/layout_about.xml index 4ac8a431..45482053 100644 --- a/app/src/main/res/layout/layout_about.xml +++ b/app/src/main/res/layout/layout_about.xml @@ -82,7 +82,7 @@ android:textColorLink="#ffffff" android:paddingLeft="15px" android:textColor="#ffffff" /> - <TextView android:text="@string/iptables_version" + <TextView android:text="@string/obfsproxy_version" android:layout_width="fill_parent" android:layout_height="wrap_content" android:autoLink="web" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 89d72a60..c23e5507 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -215,7 +215,7 @@ <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="polipo_version">Polipo v1.1.9: https://github.com/jech/polipo</string> - <string name="iptables_version">IPtables v1.4.21: http://www.netfilter.org</string> + <string name="obfsproxy_version">Obfs4proxy v0.0.8: https://github.com/Yawning/obfs4</string> <string name="openssl_version">OpenSSL v1.0.2j: http://www.openssl.org</string> <string name="hidden_service_request">An app wants to open hidden server port %1$s to the Tor network. This is safe if you trust the app.</string> <string name="found_existing_tor_process">found existing Tor process…</string>

1 0

[orbot/master] update version 15430000 aka 15.4.3-RC-1-multi-SDK16
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit dceea1178231b1136693b0de69fdb1c3f46c6a64 Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 16 23:49:03 2017 -0400 update version 15430000 aka 15.4.3-RC-1-multi-SDK16 --- app/build.gradle | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b7f031a4..dd90ed24 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,20 +26,15 @@ android { applicationId 'org.torproject.android' targetSdkVersion 23 maxSdkVersion 23 - versionCode 15420000 - versionName '15.4.2-RC-1-multi-SDK16' + versionCode 15430000 + versionName '15.4.3-RC-1-multi-SDK16' } fullperm { minSdkVersion 23 applicationId 'org.torproject.android' targetSdkVersion 25 - versionCode 15420001 - versionName '15.4.2-RC-1-multi-SDK23' - } - orbotgo { - minSdkVersion 16 - applicationId 'org.torproject.android.go' - targetSdkVersion 25 + versionCode 15430001 + versionName '15.4.3-RC-1-multi-SDK23' } } }

1 0

[orbot/master] tor-0.3.1.7 update
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit b0b6b68c841b416bec84c6a000ffe2cda13f9735 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 17 09:59:18 2017 -0400 tor-0.3.1.7 update --- external/tor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/tor b/external/tor index 802d30d9..6babd3d9 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 802d30d9b71a6d54ef5fd1278ab4858b2e76e750 +Subproject commit 6babd3d9ba9318b38b5af7278875efe84055a1b0

1 0

[orbot/master] simplify bridge selection screen
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit b98a0ff160d55d5f218031aa501d109d238b188c Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 16 23:48:45 2017 -0400 simplify bridge selection screen --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 7 +------ app/src/main/res/values-es/arrays.xml | 3 +-- app/src/main/res/values/arrays.xml | 7 +++---- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index afeab503..354b4a05 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1040,12 +1040,7 @@ public class OrbotMainActivity extends AppCompatActivity enableBridges(true); break; - case 1: //azure - Prefs.setBridgesList("meek"); - enableBridges(true); - - break; - case 2: //amazon + case 2: //amazon & azure Prefs.setBridgesList("meek"); enableBridges(true); diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml index f521c318..feb0062d 100644 --- a/app/src/main/res/values-es/arrays.xml +++ b/app/src/main/res/values-es/arrays.xml @@ -4,8 +4,7 @@ <string-array name="bridge_options"> <item>Obfs4 (Preferido)</item> - <item>Túnel a través de Azure</item> - <item>Túnel a través de Amazon</item> + <item>Túnel a través de Azure y Amazon</item> <item>Obtener nuevos puentes</item> <item></item> </string-array> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index d0f22015..9e7a6196 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -3,10 +3,9 @@ <resources> <string-array name="bridge_options"> - <item>Obfs4 (Best)</item> - <item>Tunnel through Azure</item> - <item>Tunnel through Amazon</item> - <item>Get New Bridges</item> + <item>Default Bridges (Obfs4)</item> + <item>Cloud Tunneling (Meek)</item> + <item>Get New Bridges...</item> <item></item> </string-array> <string-array name="array_hs_types">

1 0

[orbot/master] update main activity to clean up intents
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 1e2074c818673ef8eccf0017984fdcb16d6ea82e Author: n8fr8 <nathan(a)freitas.net> Date: Mon Oct 16 23:37:15 2017 -0400 update main activity to clean up intents --- .../java/org/torproject/android/OrbotMainActivity.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 013c9b43..afeab503 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -543,6 +543,7 @@ public class OrbotMainActivity extends AppCompatActivity try { String aboutText = readFromAssets(this,"LICENSE"); + aboutText = aboutText.replace("\n","<br/>"); aboutOther.setText(Html.fromHtml(aboutText)); } catch (Exception e){} @@ -747,7 +748,6 @@ public class OrbotMainActivity extends AppCompatActivity // Get intent, action and MIME type Intent intent = getIntent(); String action = intent.getAction(); - Log.d(TAG, "handleIntents " + action); if (action == null) return; @@ -797,21 +797,6 @@ public class OrbotMainActivity extends AppCompatActivity startTor(); - //never allow backgrounds start from this type of intent start - //app devs who want background starts, can use the service intents - /** - if (Prefs.allowBackgroundStarts()) - { - Intent resultIntent; - if (lastStatusIntent == null) { - resultIntent = new Intent(intent); - } else { - resultIntent = lastStatusIntent; - } - resultIntent.putExtra(TorServiceConstants.EXTRA_STATUS, torStatus); - setResult(RESULT_OK, resultIntent); - finish(); - }*/ break; case Intent.ACTION_VIEW:

1 0

[orbot/master] remove xtables and iptables (no more root support)
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 25425a622ee96a2300504c78e3af35f72747f49d Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 17 10:07:54 2017 -0400 remove xtables and iptables (no more root support) --- external/Makefile | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/external/Makefile b/external/Makefile index 86e20d6b..4d716e89 100644 --- a/external/Makefile +++ b/external/Makefile @@ -92,7 +92,6 @@ endif assets assets-clean \ openssl-static openssl-static-clean \ libevent libevent-clean \ - iptables iptables-clean \ tor tor-clean \ polipo polipo-clean @@ -185,42 +184,6 @@ libevent-clean: git clean -fdx #------------------------------------------------------------------------------# -# iptables - -iptables/Makefile: - cp iptables-patch-1 iptables - cp iptables-patch-2 iptables - cp iptables-patch-3 iptables - cp iptables-patch-4 iptables - -cd iptables && \ - patch -N -p1 --reject-file=- < iptables-patch-1 - -cd iptables && \ - patch -N -p1 --reject-file=- < iptables-patch-2 - -cd iptables && \ - patch -N -p1 --reject-file=- < iptables-patch-3 - -cd iptables && \ - patch -N -p0 --reject-file=- < iptables-patch-4 - cd iptables && ./autogen.sh - cp config.sub iptables - cp config.guess iptables - cd iptables && \ - CC="$(CC)" AR="$(AR)" RANLIB=$(RANLIB) CFLAGS="$(CFLAGS) -I$(EXTERNAL_ROOT)/include" LDFLAGS="$(LDFLAGS)" \ - ./configure --host=$(HOST) --disable-shared --enable-static - -iptables-build-stamp: iptables/Makefile - $(MAKE) -C iptables - touch iptables-build-stamp - cp iptables/iptables/xtables-multi bin/xtables - -iptables: iptables-build-stamp - -iptables-clean: - -rm -f iptables-build-stamp - -rm bin/xtables - -cd iptables && \ - git clean -fdx - -#------------------------------------------------------------------------------# # tor tor/configure: @@ -302,14 +265,12 @@ pluto-clean: #in order to stop Android OS (older devices) from trying to compress/decompress it #this is related to a bug in compression of assets and resources > 1MB -assets: tor polipo iptables pluto +assets: tor polipo pluto install -d ../orbotservice/src/main/assets/$(APP_ABI) -$(STRIP) bin/polipo -zip ../orbotservice/src/main/assets/$(APP_ABI)/polipo.mp3 bin/polipo -$(STRIP) bin/tor -zip ../orbotservice/src/main/assets/$(APP_ABI)/tor.mp3 bin/tor - -$(STRIP) bin/xtables - -zip ../orbotservice/src/main/assets/$(APP_ABI)/xtables.mp3 bin/xtables -$(STRIP) bin/obfs4proxy -zip ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3 bin/obfs4proxy -$(STRIP) ../orbotservice/src/main/libs/$(APP_ABI)/pdnsd @@ -319,7 +280,6 @@ assets: tor polipo iptables pluto assets-clean: -rm ../orbotservice/src/main/assets/$(APP_ABI)/polipo.mp3 -rm ../orbotservice/src/main/assets/$(APP_ABI)/tor.mp3 - -rm ../orbotservice/src/main/assets/$(APP_ABI)/xtables.mp3 -rm ../orbotservice/src/main/assets/$(APP_ABI)/obfs4proxy.mp3 -rm ../orbotservice/src/main/assets/$(APP_ABI)/pdnsd.mp3 @@ -328,7 +288,7 @@ assets-clean: # cleanup, cleanup, put the toys away ##clean: openssl-clean libevent-clean tor-clean polipo-clean assets-clean -clean: openssl-clean libevent-clean tor-clean polipo-clean iptables-clean pluto-clean +clean: openssl-clean libevent-clean tor-clean polipo-clean pluto-clean #------------------------------------------------------------------------------# # debugging stuff

1 0

[orbot/master] update Makefile for tor compression options
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit 90975fb18a61df16b2ee8cf39d40d3fa9455db16 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Oct 20 00:14:57 2017 -0400 update Makefile for tor compression options --- external/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 4d716e89..2e8c29fd 100644 --- a/external/Makefile +++ b/external/Makefile @@ -207,7 +207,8 @@ tor/Makefile: tor/configure --disable-asciidoc \ --enable-static-libevent --with-libevent-dir=$(EXTERNAL_ROOT) \ --enable-static-openssl --with-openssl-dir=$(EXTERNAL_ROOT) \ - --disable-linker-hardening --disable-gcc-hardening --disable-tool-name-check + --disable-linker-hardening --disable-gcc-hardening --disable-tool-name-check \ + --disable-lzma --enable-zstd tor-build-stamp: tor/Makefile $(MAKE) -C tor all-am

1 0

[orbot/master] update tor constants to 0.3.1.7-openssl1.0.2k
by n8fr8＠torproject.org 25 Oct '17

25 Oct '17

commit e6003f670f42a0a59d21b53bd407706c1f2737c1 Author: n8fr8 <nathan(a)freitas.net> Date: Fri Oct 20 00:21:33 2017 -0400 update tor constants to 0.3.1.7-openssl1.0.2k --- .../main/java/org/torproject/android/service/TorServiceConstants.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java index 5d87fec2..32bd9045 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorServiceConstants.java @@ -135,7 +135,7 @@ public interface TorServiceConstants { public static final String CMD_UPDATE_TRANS_PROXY = "update"; public static final String CMD_SET_EXIT = "setexit"; - public static final String BINARY_TOR_VERSION = "0.3.0.8-openssl1.0.2k-1"; + public static final String BINARY_TOR_VERSION = "0.3.1.7-openssl1.0.2k"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INSTALLED"; //obfsproxy @@ -155,4 +155,6 @@ public interface TorServiceConstants { public static final String HIDDEN_SERVICES_DIR = "hidden_services"; + + }

1 0