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

[orbot/master] add "no transproxy" warning strings bac kin
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 1c7eedd4e408cda64dab69db081c03bbe0bf3326 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 31 10:00:50 2017 -0400 add "no transproxy" warning strings bac kin --- app/src/main/res/values/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4b10ee13..7dbc47c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -382,4 +382,6 @@ <string name="consider_enable_battery_optimizations">Consider enable battery optimizations</string> <string name="pref_isolate_dest">Isolate destination addresses</string> <string name="pref_isolate_dest_summary">Use a different circuit for each destination address</string> + <string name="no_transproxy_warning_short">WARNING: Transproxying no longer supported</string> + <string name="no_transproxy_warning">WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.</string> </resources>

1 0

[orbot/master] update changelog fo 15.5.1
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 5d218adc14447839ac24506df949b1d060729f33 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 31 11:58:45 2017 -0400 update changelog fo 15.5.1 --- CHANGELOG | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index eb48da1c..43fe17fe 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,19 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +/** v15.5.1 / 31 Oct 2017 / 2c99e9efa4aa253e4d63ee786759efdbeaf9b78f **/ + +2c99e9e update version to 15.5.1-RC-1 (1551000*) +c53204f only refresh VPN settings if app selection changes +5b9eedb update VPN app manager to load async, and sort selected to top +1c7eedd add "no transproxy" warning strings bac kin +19e927e Merge pull request #91 from ahf/simpleperf-work +54688e2 Merge pull request #87 from Akku05/patch-1 +14367e0 Merge pull request #76 from dixidroid/master +8bbf0ba Merge branch 'isolateDest' of https://github.com/SpotComms/orbot into SpotComms-isolateDest +750a282 update to latest build tools and gradle - add new flavordimension tag +d591cdb Don't strip binaries when doing a debug build. +87edea9 Disable Zstandard for now. + /** v15.4.4 / 28 Oct 2017 / 032321656999543ab160f9739ca175d790bbd974 **/ 0323216 update to 15.4.4-BETA-2-multi-SDK16

1 0

[orbot/master] only refresh VPN settings if app selection changes
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit c53204f9c346332a7dc4757fb1a3ccbd67a79301 Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 31 11:11:46 2017 -0400 only refresh VPN settings if app selection changes --- .../org/torproject/android/OrbotMainActivity.java | 12 ++++-- .../torproject/android/ui/AppManagerActivity.java | 44 +++++++++++----------- .../android/service/vpn/OrbotVpnManager.java | 1 - .../android/service/vpn/TorVpnService.java | 6 --- 4 files changed, 32 insertions(+), 31 deletions(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 2c45d0f6..60a3a2c5 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -609,6 +609,12 @@ public class OrbotMainActivity extends AppCompatActivity } + private void refreshVPNApps () + { + stopVpnService(); + startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); + } + private void enableVPN (boolean enable) { Prefs.putUseVpn(enable); @@ -798,10 +804,8 @@ public class OrbotMainActivity extends AppCompatActivity case INTENT_ACTION_REQUEST_START_TOR: autoStartFromIntent = true; - startTor(); - break; case Intent.ACTION_VIEW: String urlString = intent.getDataString(); @@ -967,7 +971,9 @@ public class OrbotMainActivity extends AppCompatActivity } else if (request == REQUEST_VPN_APPS_SELECT) { - startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); + if (response == RESULT_OK) + refreshVPNApps(); + } IntentResult scanResult = IntentIntegrator.parseActivityResult(request, response, data); diff --git a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index 9d909f54..0f8e2f06 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -18,6 +18,7 @@ import org.torproject.android.service.vpn.TorifiedApp; import android.app.ProgressDialog; import android.content.Context; +import android.content.Intent; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; @@ -41,7 +42,7 @@ import android.widget.ImageView; import android.widget.ListAdapter; import android.widget.TextView; -public class AppManagerActivity extends AppCompatActivity implements OnCheckedChangeListener, OnClickListener, OrbotConstants { +public class AppManagerActivity extends AppCompatActivity implements OnClickListener, OrbotConstants { private GridView listApps; private ListAdapter adapterApps; @@ -132,8 +133,6 @@ public class AppManagerActivity extends AppCompatActivity implements OnCheckedCh entry.icon = (ImageView) convertView.findViewById(R.id.itemicon); entry.box = (CheckBox) convertView.findViewById(R.id.itemcheck); entry.text = (TextView) convertView.findViewById(R.id.itemtext); - - convertView.setTag(entry); @@ -146,9 +145,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnCheckedCh try { entry.icon.setImageDrawable(pMgr.getApplicationIcon(app.getPackageName())); entry.icon.setOnClickListener(AppManagerActivity.this); - - if (entry.box != null) - entry.icon.setTag(entry.box); + entry.icon.setTag(entry.box); } catch (Exception e) { @@ -159,17 +156,12 @@ public class AppManagerActivity extends AppCompatActivity implements OnCheckedCh if (entry.text != null) { entry.text.setText(app.getName()); entry.text.setOnClickListener(AppManagerActivity.this); - - if (entry.box != null) - entry.text.setTag(entry.box); + entry.text.setTag(entry.box); } - if (entry.box != null) { - entry.box.setOnCheckedChangeListener(AppManagerActivity.this); - entry.box.setTag(app); + entry.box.setOnClickListener(AppManagerActivity.this); entry.box.setChecked(app.isTorified()); - } return convertView; @@ -307,6 +299,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnCheckedCh { StringBuilder tordApps = new StringBuilder(); + Intent response = new Intent(); for (TorifiedApp tApp:mApps) { @@ -314,6 +307,7 @@ public class AppManagerActivity extends AppCompatActivity implements OnCheckedCh { tordApps.append(tApp.getUsername()); tordApps.append("|"); + response.putExtra(tApp.getUsername(),true); } } @@ -321,12 +315,14 @@ public class AppManagerActivity extends AppCompatActivity implements OnCheckedCh edit.putString(PREFS_KEY_TORIFIED, tordApps.toString()); edit.commit(); + setResult(RESULT_OK,response); } /** * Called an application is check/unchecked */ + /** public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { final TorifiedApp app = (TorifiedApp) buttonView.getTag(); if (app != null) { @@ -335,23 +331,29 @@ public class AppManagerActivity extends AppCompatActivity implements OnCheckedCh saveAppSettings(this); - } + }**/ public void onClick(View v) { - CheckBox cbox = (CheckBox)v.getTag(); + CheckBox cbox = null; - final TorifiedApp app = (TorifiedApp)cbox.getTag(); - if (app != null) { - app.setTorified(!app.isTorified()); - cbox.setChecked(app.isTorified()); - } + if (v instanceof CheckBox) + cbox = (CheckBox)v; + else if (v.getTag() instanceof CheckBox) + cbox = (CheckBox)v.getTag(); - saveAppSettings(this); + if (cbox != null) { + final TorifiedApp app = (TorifiedApp) cbox.getTag(); + if (app != null) { + app.setTorified(!app.isTorified()); + cbox.setChecked(app.isTorified()); + } + saveAppSettings(this); + } } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java index 3d54e888..bbae15ea 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/OrbotVpnManager.java @@ -114,7 +114,6 @@ public class OrbotVpnManager implements Handler.Callback { if (!mIsLollipop) { - startSocksBypass(); } diff --git a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java index f396860d..7d18ffd8 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/vpn/TorVpnService.java @@ -5,12 +5,6 @@ import android.app.Service; import android.content.Intent; import android.net.VpnService; import android.os.Build; -import android.text.TextUtils; -import android.util.Log; - -import org.torproject.android.service.OrbotConstants; -import org.torproject.android.service.TorServiceConstants; -import org.torproject.android.service.util.Prefs; /** * Created by n8fr8 on 9/26/16.

1 0

[orbot/master] Merge pull request #91 from ahf/simpleperf-work
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 19e927effaa28927c10b92a64c1105e184606ce8 Merge: 54688e28 d591cdb0 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Oct 31 09:47:50 2017 -0400 Merge pull request #91 from ahf/simpleperf-work Add `DEBUG` option to external C dependencies external/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)

1 0

[orbot/master] update version to 15.5.1-RC-1 (1551000*)
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 2c99e9efa4aa253e4d63ee786759efdbeaf9b78f Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 31 11:51:12 2017 -0400 update version to 15.5.1-RC-1 (1551000*) --- app/build.gradle | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9ee6da95..2b7329c2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -30,16 +30,16 @@ android { applicationId 'org.torproject.android' targetSdkVersion 23 maxSdkVersion 23 - versionCode 15500000 - versionName '15.5.0-RC-1-multi-SDK16' + versionCode 15510000 + versionName '15.5.1-RC-1-multi-SDK16' } fullperm { dimension "free" minSdkVersion 23 applicationId 'org.torproject.android' targetSdkVersion 25 - versionCode 15500001 - versionName '15.5.0-RC-1-multi-SDK23' + versionCode 15510001 + versionName '15.5.1-RC-1-multi-SDK23' } } }

1 0

[orbot/master] Merge pull request #87 from Akku05/patch-1
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 54688e28067bc6244cb842d9fd996544880cf7c4 Merge: 14367e0a d94657d1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Oct 31 09:47:24 2017 -0400 Merge pull request #87 from Akku05/patch-1 for issue #85 BUILD | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[orbot/master] Disable Zstandard for now.
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 87edea9ce61914e057dc391be6219097ced9876c Author: Alexander Færøy <ahf(a)torproject.org> Date: Sun Oct 29 22:35:54 2017 -0400 Disable Zstandard for now. Because of bug #90 the current build process will be broken for people who have Zstandard headers available on their host system. For people who do not have the headers available the build system will silently ignore the `--enable-zstd` and build Tor without support for it. See: https://github.com/n8fr8/orbot/issues/90 --- external/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 2e8c29fd..ea62aa95 100644 --- a/external/Makefile +++ b/external/Makefile @@ -208,7 +208,7 @@ tor/Makefile: tor/configure --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-lzma --enable-zstd + --disable-lzma --disable-zstd tor-build-stamp: tor/Makefile $(MAKE) -C tor all-am

1 0

[orbot/master] fixed crash when an user tries to add the same hidden service port twice
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 2922e487305dc8a808990f2ae14169fc5485be24 Author: Igor Koznin <dixidroid(a)gmail.com> Date: Sun Jul 16 15:55:49 2017 +0300 fixed crash when an user tries to add the same hidden service port twice --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index 0e9e2f72..3d4c954c 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -624,7 +624,7 @@ public class OrbotMainActivity extends AppCompatActivity if (row == null || row.getCount() < 1) { cr.insert(HSContentProvider.CONTENT_URI, fields); - } else { + } else if (row.moveToFirst()) { onionHostname = row.getString(row.getColumnIndex(HSContentProvider.HiddenService.DOMAIN)); row.close(); }

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit 04d4786cc40b2d80b4cd34e7d5339b0100861c8f Merge: 151d5eded c50c98ba6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:43:07 2017 -0400 Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9 changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+)

1 0

[tor/maint-0.2.9] Make changes in server_mode() affect workers; fix a crash.
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c50c98ba6a3eae0b9a3a19c4a3498809080d7ac0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 2 11:11:30 2017 -0400 Make changes in server_mode() affect workers; fix a crash. Without this fix, changes from client to bridge don't trigger transition_affects_workers(), so we would never have actually initialized the cpuworkers. Fixes bug 23693. Bugfix on 3bcdb26267502e0 0.2.6.3-alpha, which fixed bug 14901 in the general case, but not on the case where public_server_mode() did not change. --- changes/bug23693 | 6 ++++++ src/or/config.c | 1 + 2 files changed, 7 insertions(+) diff --git a/changes/bug23693 b/changes/bug23693 new file mode 100644 index 000000000..796398be5 --- /dev/null +++ b/changes/bug23693 @@ -0,0 +1,6 @@ + o Minor bugfixes (relay, crash): + - Avoid a crash when transitioning from client mode to bridge mode. + Previously, we would launch the worker threads whenever our "public + server" mode changed, but not when our "server" mode changed. + Fixes bug 23693; bugfix on 0.2.6.3-alpha. + diff --git a/src/or/config.c b/src/or/config.c index 2e001ee5a..23c566c6c 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4453,6 +4453,7 @@ options_transition_affects_workers(const or_options_t *old_options, new_options->ServerDNSSearchDomains || old_options->SafeLogging_ != new_options->SafeLogging_ || old_options->ClientOnly != new_options->ClientOnly || + server_mode(old_options) != server_mode(new_options) || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || old_options->LogMessageDomains != new_options->LogMessageDomains)

1 0