February 2016 - tor-commits - lists.torproject.org

[orbot/master] enable backwards compat to Android SDK 10 (Android 2.3.*)
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit bac16a57fc5ec3eb71cc33b82f7fd9ba35149a81 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 2 12:22:24 2016 -0500 enable backwards compat to Android SDK 10 (Android 2.3.*) --- external/superuser-commands | 2 +- src/org/torproject/android/OrbotMainActivity.java | 82 ++++++++++++---------- .../torproject/android/vpn/VPNEnableActivity.java | 2 +- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/external/superuser-commands b/external/superuser-commands index be997be..834a501 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit be997be8fff6dc00cd249fdfd128d6820461db99 +Subproject commit 834a50146a2dc07c57f02d37ecd7f2d521b52c2b diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index e71d6c1..0a4c25a 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -3,6 +3,8 @@ package org.torproject.android; +import static org.torproject.android.OrbotConstants.TAG; + import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.UnsupportedEncodingException; @@ -25,8 +27,7 @@ import org.torproject.android.ui.PromoAppsActivity; import org.torproject.android.ui.Rotate3dAnimation; import org.torproject.android.vpn.VPNEnableActivity; -import android.app.ActionBar; -import android.app.Activity; +import android.annotation.SuppressLint; import android.app.ActivityManager; import android.app.ActivityManager.RunningServiceInfo; import android.app.AlertDialog; @@ -49,10 +50,10 @@ import android.os.Message; import android.os.RemoteException; import android.support.v4.content.LocalBroadcastManager; import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarActivity; import android.support.v7.app.ActionBarDrawerToggle; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; +import android.util.AttributeSet; import android.util.Log; import android.view.GestureDetector; import android.view.GestureDetector.SimpleOnGestureListener; @@ -114,7 +115,7 @@ public class OrbotMainActivity extends AppCompatActivity public final static String INTENT_ACTION_REQUEST_HIDDEN_SERVICE = "org.torproject.android.REQUEST_HS_PORT"; public final static String INTENT_ACTION_REQUEST_START_TOR = "org.torproject.android.START_TOR"; - + // for bridge loading from the assets default bridges.txt file class Bridge { @@ -124,7 +125,15 @@ public class OrbotMainActivity extends AppCompatActivity private ArrayList<Bridge> alBridges = null; - + //this is needed for backwards compat back to Android 2.3.* + @SuppressLint("NewApi") + public View onCreateView(View parent, String name, Context context, AttributeSet attrs) + { + if(Build.VERSION.SDK_INT >= 11) + return super.onCreateView(parent, name, context, attrs); + return null; + } + /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -261,29 +270,39 @@ public class OrbotMainActivity extends AppCompatActivity mBtnVPN = (ToggleButton)findViewById(R.id.btnVPN); - boolean useVPN = Prefs.useVpn(); - mBtnVPN.setChecked(useVPN); - - //auto start VPN if VPN is enabled - if (useVPN) + boolean canDoVPN = Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH; + + if (!canDoVPN) { - startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + //if not SDK 14 or higher, we can't use the VPN feature + mBtnVPN.setVisibility(View.GONE); } - - mBtnVPN.setOnClickListener(new View.OnClickListener () + else { - - @Override - public void onClick(View v) { - - if (mBtnVPN.isChecked()) - startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); - else - stopVpnService(); - + boolean useVPN = Prefs.useVpn(); + mBtnVPN.setChecked(useVPN); + + //auto start VPN if VPN is enabled + if (useVPN) + { + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); } - - }); + + mBtnVPN.setOnClickListener(new View.OnClickListener () + { + + @Override + public void onClick(View v) { + + if (mBtnVPN.isChecked()) + startActivity(new Intent(OrbotMainActivity.this,VPNEnableActivity.class)); + else + stopVpnService(); + + } + + }); + } mBtnBridges = (ToggleButton)findViewById(R.id.btnBridges); @@ -1018,21 +1037,6 @@ public class OrbotMainActivity extends AppCompatActivity private void requestTorRereadConfig() { sendIntentToService(TorServiceConstants.CMD_SIGNAL_HUP); } - - - /** - @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) - public void startVpnService () - { - Intent intent = VpnService.prepare(getApplicationContext()); - if (intent != null) { - startActivityForResult(intent,REQUEST_VPN); - } - else - { - sendIntentToService(TorServiceConstants.CMD_VPN); - } - }*/ public void stopVpnService () { diff --git a/src/org/torproject/android/vpn/VPNEnableActivity.java b/src/org/torproject/android/vpn/VPNEnableActivity.java index 8d254f1..8b7dbc6 100644 --- a/src/org/torproject/android/vpn/VPNEnableActivity.java +++ b/src/org/torproject/android/vpn/VPNEnableActivity.java @@ -161,4 +161,4 @@ public class VPNEnableActivity extends Activity { startService(torService); } -} \ No newline at end of file +}

1 0

[orbot/master] update superuser commands library
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit c8584f6ec97140146ab58ea5cb1dc85b77a11ce2 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Feb 2 12:23:58 2016 -0500 update superuser commands library --- external/superuser-commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/superuser-commands b/external/superuser-commands index 834a501..63b4783 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit 834a50146a2dc07c57f02d37ecd7f2d521b52c2b +Subproject commit 63b4783c7d4873690cf39989d9c9f8399c073ddb

1 0

[orbot/master] bridges dedicated to GeorgeTorwell
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit 5eb628b03a22d188990873fcf199518e69db3db1 Author: Nima Fatemi <nima(a)torproject.org> Date: Tue Feb 9 22:16:52 2016 +0000 bridges dedicated to GeorgeTorwell --- assets/bridges.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/bridges.txt b/assets/bridges.txt index 86ebae2..679f811 100644 --- a/assets/bridges.txt +++ b/assets/bridges.txt @@ -13,6 +13,10 @@ obfs4 154.35.22.10:41835 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R obfs4 154.35.22.11:49868 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 obfs4 154.35.22.12:80 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 obfs4 154.35.22.13:443 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 +obfs4 154.35.22.10:1984 8FB9F4319E89E5C6223052AA525A192AFBC85D55 cert=GGGS1TX4R81m3r0HBl79wKy1OtPPNR2CZUIrHjkRg65Vc2VR8fOyo64f9kmT1UAFG7j0HQ iat-mode=0 +obfs4 154.35.22.11:1984 A832D176ECD5C7C6B58825AE22FC4C90FA249637 cert=YPbQqXPiqTUBfjGFLpm9JYEFTBvnzEJDKJxXG5Sxzrr/v2qrhGU4Jls9lHjLAhqpXaEfZw iat-mode=0 +obfs4 154.35.22.12:1984 00DC6C4FA49A65BD1472993CF6730D54F11E0DBB cert=N86E9hKXXXVz6G7w2z8wFfhIDztDAzZ/3poxVePHEYjbKDWzjkRDccFMAnhK75fc65pYSg iat-mode=0 +obfs4 154.35.22.13:1984 FE7840FE1E21FE0A0639ED176EDA00A3ECA1E34D cert=fKnzxr+m+jWXXQGCaXe4f2gGoPXMzbL+bTBbXMYXuK0tMotd+nXyS33y2mONZWU29l81CA iat-mode=0 meek 0.0.2.0:1 46D4A71197B8FA515A826C6B017C522FE264655B url=https://meek-reflect.appspot.com/ front=www.google.com meek 0.0.2.0:2 B9E7141C594AF25699E0079C1F0146F409495296 url=https://d2zfqthxsdq309.cloudfront.net/ front=a0.awsstatic.com meek 0.0.2.0:3 A2C13B7DFCAB1CBF3A884B6EB99A98067AB6EF44 url=https://az786092.vo.msecnd.net/ front=ajax.aspnetcdn.com

1 0

[orbot/master] peg to last ant compat release
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit 80e8c47e627e5b6d3ca4339e6b5af209f4feb7cc Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 12:09:37 2016 -0500 peg to last ant compat release --- external/superuser-commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/superuser-commands b/external/superuser-commands index 63b4783..be997be 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit 63b4783c7d4873690cf39989d9c9f8399c073ddb +Subproject commit be997be8fff6dc00cd249fdfd128d6820461db99

1 0

[orbot/master] Merge branch '1984-bridges' of https://github.com/mrphs/orbot into dev_nima_1984_bridges
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit 043b151fb1ea57f9e9843c89cb2c18bb4e087ae0 Merge: c8584f6 5eb628b Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 11:05:37 2016 -0500 Merge branch '1984-bridges' of https://github.com/mrphs/orbot into dev_nima_1984_bridges assets/bridges.txt | 4 ++++ 1 file changed, 4 insertions(+)

1 0

[orbot/master] update to orbot ant build version
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit 9a8e4dd80f9b2a6542900f4a8595f2495f4021ef Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 12:33:12 2016 -0500 update to orbot ant build version --- external/superuser-commands | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/superuser-commands b/external/superuser-commands index be997be..d38520e 160000 --- a/external/superuser-commands +++ b/external/superuser-commands @@ -1 +1 @@ -Subproject commit be997be8fff6dc00cd249fdfd128d6820461db99 +Subproject commit d38520e6c80aaf84bcc1c0eb0f5c904c0e8b79af

1 0

[orbot/master] update git submodules
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit 00f82f0913f6e5ac4be1070034acf3a3be2bc18f Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 13:19:15 2016 -0500 update git submodules --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 517f919..665ab2a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ ignore = dirty [submodule "external/superuser-commands"] path = external/superuser-commands - url = https://github.com/dschuermann/superuser-commands.git + url = https://github.com/guardianproject/RootCommands.git ignore = dirty [submodule "external/polipo"] path = external/polipo

1 0

[orbot/master] handle NPE better for dev.gp.info #6686
by n8fr8＠torproject.org 23 Feb '16

23 Feb '16

commit e9d28a4445f3dc055f05649792965b249102933c Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 22 15:07:40 2016 -0500 handle NPE better for dev.gp.info #6686 in some cases the connection becomes null while you are interacting with it --- src/org/torproject/android/service/TorService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 94e3317..12da009 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -2245,9 +2245,9 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setConf("DisableNetwork","0"); } - catch (IOException ioe) + catch (Exception ioe) { - ioe.printStackTrace(); + Log.e(TAG, "Connection exception occured resetting exits",ioe); } } } @@ -2270,12 +2270,11 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon conn.setConf("DisableNetwork","1"); conn.setConf("DisableNetwork","0"); - } - catch (IOException ioe) + catch (Exception ioe) { - ioe.printStackTrace(); + Log.e(TAG, "Connection exception occured resetting exits",ioe); } } }

1 0

[tor/master] Add a missing free in parsing an :auto port
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit bb431ad3dfae6941a0bd615b17283ca8c0a5fe4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 15:51:43 2016 -0500 Add a missing free in parsing an :auto port Fixes bug 18374; bugfix on 0.2.3.3-alpha. --- changes/bug18374 | 3 +++ src/or/config.c | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug18374 b/changes/bug18374 new file mode 100644 index 0000000..4764c53 --- /dev/null +++ b/changes/bug18374 @@ -0,0 +1,3 @@ + o Minor bugfixes (configuration): + - Fix a tiny memory leak when parsing a port configuration ending in + ":auto". Fixes bug 18374; bugfix on 0.2.3.3-alpha. diff --git a/src/or/config.c b/src/or/config.c index 5273d5a..ba02e9f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -6373,6 +6373,7 @@ parse_port_config(smartlist_t *out, tor_free(addrtmp); goto err; } + tor_free(addrtmp); } else { /* Try parsing integer port before address, because, who knows? "9050" might be a valid address. */

1 0

[tor/master] asan does not like TO_CONN(NULL)
by nickm＠torproject.org 22 Feb '16

22 Feb '16

commit ef42c00cf0b3a10673a80dd8cf98c683fb68a33e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 22 15:45:37 2016 -0500 asan does not like TO_CONN(NULL) --- changes/test_asan | 3 +++ src/test/test_dir_handle_get.c | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/changes/test_asan b/changes/test_asan new file mode 100644 index 0000000..ce0aa97 --- /dev/null +++ b/changes/test_asan @@ -0,0 +1,3 @@ + o Testing: + - Fix several warnings from clang's address sanitizer produced in the + unit tests. diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index e1ac50e..c81ed7b 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2255,7 +2255,6 @@ status_vote_next_consensus_signatures_test(char **header, char **body, static void test_dir_handle_get_status_vote_next_consensus_signatures_not_found(void* data) { - dir_connection_t *conn = NULL; char *header = NULL, *body = NULL; size_t body_used; (void) data; @@ -2266,7 +2265,6 @@ test_dir_handle_get_status_vote_next_consensus_signatures_not_found(void* data) tt_str_op(NOT_FOUND, OP_EQ, header); done: - connection_free_(TO_CONN(conn)); tor_free(header); tor_free(body); } @@ -2308,7 +2306,6 @@ test_dir_handle_get_status_vote_next_consensus_signatures(void* data) static void test_dir_handle_get_status_vote_next_consensus_signatures_busy(void* data) { - dir_connection_t *conn = NULL; char *header = NULL, *body = NULL; size_t body_used; (void) data; @@ -2328,7 +2325,6 @@ test_dir_handle_get_status_vote_next_consensus_signatures_busy(void* data) done: UNMOCK(get_options); NS_UNMOCK(dirvote_get_pending_detached_signatures); - connection_free_(TO_CONN(conn)); tor_free(header); tor_free(body); or_options_free(mock_options); mock_options = NULL;

1 0