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

[orbot/master] Add correct torrc entries for obfuscated bridges
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit ab4f789eff85ab148ea6f3ba19c8aaa576864fe7 Author: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Date: Fri Feb 10 23:12:54 2012 +0100 Add correct torrc entries for obfuscated bridges The lines have the following form: Bridge obfs2 ${IP address of bridge} ... ClientTransportPlugin obfs2 exec ${/path/to/obfsproxy} --managed --- src/org/torproject/android/service/TorService.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 80daaab..70f29a1 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1462,16 +1462,28 @@ public class TorService extends Service implements TorServiceConstants, TorConst showToolbarNotification(getString(R.string.notification_using_bridges) + ": " + bridgeList, TRANSPROXY_NOTIFY_ID, R.drawable.tornotification, -1); + boolean obfsBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_OBFUSCATED, false); + String bridgeCfgKey = "bridge"; + + if (obfsBridges) + { + bridgeCfgKey = bridgeCfgKey + " obfs2"; + } + StringTokenizer st = new StringTokenizer(bridgeList,bridgeDelim); while (st.hasMoreTokens()) { - mBinder.updateConfiguration("bridge", st.nextToken(), false); + mBinder.updateConfiguration(bridgeCfgKey, st.nextToken(), false); } - + + if (obfsBridges) + { + mBinder.updateConfiguration("ClientTransportPlugin","obfs2 exec " + fileObfsProxy.getAbsolutePath() + " --managed", false); + } + mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); - } else {

1 0

[orbot/master] updated default string values
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit bf92bd1cf3fa6263d8995bbacc4ce3be422b4982 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 01:26:54 2012 -0500 updated default string values --- res/values/strings.xml | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 94299a1..9da8b98 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -257,6 +257,5 @@ <string name="pref_use_persistent_notifications">Always keep the icon in toolbar when Orbot is connected</string> <string name="pref_use_persistent_notifications_title">Always-On Notifications</string> -<string name="default_bridges">obfs2 146.185.23.182:8080,obfs2 108.166.107.30:42396,obfs2 18.85.35.209:49937,obfs2 143.215.129.51:35777,obfs2 68.22.187.113:45672,obfs2 209.176.111.36:38297,obfs2 195.43.157.80:51715,obfs2 128.31.0.34:1051,obfs2 184.73.35.40:8080,obfs2 141.201.27.48:37708</string> <string name="notification_using_bridges">Bridges enabled!</string> </resources>

1 0

[orbot/master] Add constants related to obfuscated bridges
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit c21be28cf3bc5b575605939f5d2c1e8fd74ca8d1 Author: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Date: Fri Feb 10 23:10:00 2012 +0100 Add constants related to obfuscated bridges --- src/org/torproject/android/TorConstants.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 8b44281..2574c6a 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -32,6 +32,7 @@ public interface TorConstants { public final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_LIST = "pref_bridges_list"; + public final static String PREF_BRIDGES_OBFUSCATED = "pref_bridges_obfuscated"; public final static String PREF_OR = "pref_or"; public final static String PREF_OR_PORT = "pref_or_port"; public final static String PREF_OR_NICKNAME = "pref_or_nickname";

1 0

[orbot/master] Add strings and prefs related to obfuscated bridges
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit c7e55cac6210e71404d68d7cdaf8c63624fb5984 Author: Adrian-Ken Rueegsegger <ken(a)codelabs.ch> Date: Fri Feb 10 23:08:37 2012 +0100 Add strings and prefs related to obfuscated bridges --- res/values/strings.xml | 2 ++ res/xml/preferences.xml | 10 ++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 9da8b98..f519a91 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -209,7 +209,9 @@ <string name="use_only_these_specified_nodes">Use *only* these specified nodes</string> <string name="bridges">Bridges</string> <string name="use_bridges">Use Bridges</string> +<string name="bridges_obfuscated">Obfuscated Bridges</string> <string name="enable_alternate_entrance_nodes_into_the_tor_network">Enable alternate entrance nodes into the Tor Network</string> +<string name="enable_if_configured_bridges_are_obfuscated_bridges">Enable if configured bridges are obfuscated bridges</string> <string name="ip_address_and_port_of_bridges">IP address and port of bridges</string> <string name="enter_bridge_addresses">Enter Bridge Addresses</string> <string name="relays">Relays</string> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 15f3abc..683208c 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -94,18 +94,20 @@ android:summary="@string/use_only_these_specified_nodes"/> <CheckBoxPreference android:defaultValue="true" android:title="@string/use_bridges" android:key="pref_bridges_enabled" -android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"></CheckBoxPreference> +android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/> + +<CheckBoxPreference android:key="pref_bridges_obfuscated" +android:title="@string/bridges_obfuscated" +android:summary="@string/enable_if_configured_bridges_are_obfuscated_bridges"/> - <EditTextPreference android:key="pref_bridges_list" android:title="@string/bridges" android:summary="@string/ip_address_and_port_of_bridges" android:dialogTitle="@string/enter_bridge_addresses" android:defaultValue="@string/default_bridges" /> -</PreferenceCategory> - +</PreferenceCategory> <PreferenceCategory android:title="@string/relays"> <CheckBoxPreference android:key="pref_or"

1 0

[orbot/master] set default bridge obfs mode to true
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit 0cf708f98d2583314cf37037fef449e05263cce8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 13 07:28:50 2012 -0500 set default bridge obfs mode to true --- res/xml/preferences.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 683208c..b7b5a43 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -97,6 +97,7 @@ android:title="@string/use_bridges" android:key="pref_bridges_enabled" android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network"/> <CheckBoxPreference android:key="pref_bridges_obfuscated" + android:defaultValue="true" android:title="@string/bridges_obfuscated" android:summary="@string/enable_if_configured_bridges_are_obfuscated_bridges"/>

1 0

[orbot/master] cleaned up locale, set default to EN
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit 48ea51ff8ef4cd64166e01f4e2775ee05be94295 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 12:29:30 2012 -0500 cleaned up locale, set default to EN --- src/org/torproject/android/Orbot.java | 3 --- src/org/torproject/android/OrbotApp.java | 2 +- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 96a54e7..93013ba 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -3,8 +3,6 @@ package org.torproject.android; -import java.util.Locale; - import org.torproject.android.service.ITorService; import org.torproject.android.service.ITorServiceCallback; import org.torproject.android.service.TorServiceConstants; @@ -24,7 +22,6 @@ import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.PackageManager.NameNotFoundException; -import android.content.res.Configuration; import android.net.Uri; import android.os.Bundle; import android.os.Handler; diff --git a/src/org/torproject/android/OrbotApp.java b/src/org/torproject/android/OrbotApp.java index 10eff32..8d78a06 100644 --- a/src/org/torproject/android/OrbotApp.java +++ b/src/org/torproject/android/OrbotApp.java @@ -11,7 +11,7 @@ public class OrbotApp extends Application implements TorConstants { private Locale locale; - private final static String DEFAULT_LOCALE = "fa"; + private final static String DEFAULT_LOCALE = "en"; @Override public void onCreate() {

1 0

[orbot/master] updates to build, changelog info for obfsproxy
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit dda8dd9b1cad30850aaa9b700b9bbbf560842a37 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 13 07:32:16 2012 -0500 updates to build, changelog info for obfsproxy --- BUILD | 2 ++ CHANGELOG | 5 +++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/BUILD b/BUILD index c4795ca..87971c3 100644 --- a/BUILD +++ b/BUILD @@ -1,4 +1,6 @@ +// 2012/02/13 will be adding information on how to build OBFSPROXY binary + // 2011/04/15 this document is a bit out of date. We will be updating to use // the standalone cross-compiler that is offered by the Android NDK soon diff --git a/CHANGELOG b/CHANGELOG index 043536e..21810d4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,10 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.7.2 +- added obfsproxy binary to res/raw and binary installation process +- added new preferences to support obfsproxy bridge configuration +- upgraded tor binary to 0.2.3.11-alpha + 1.0.7 - reduced data folder size by making geoip file only installed on demand - added options for turning of persistent notification

1 0

[orbot/master] moved bridge config out of torrc into applyPrefs()
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit 3f3e091a5455136a8698e75f3c4c1ee2b34addde Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 12:29:11 2012 -0500 moved bridge config out of torrc into applyPrefs() --- res/raw/torrc | 1 - src/org/torproject/android/service/TorService.java | 2 ++ .../android/service/TorServiceConstants.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index 93feb42..5366ce8 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,4 +11,3 @@ TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 DNSPort 5400 -ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 80daaab..4f8ae73 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -1470,6 +1470,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + mBinder.updateConfiguration("ClientTransportPlugin","obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed",false); + mBinder.updateConfiguration("UpdateBridgesFromAuthority", "0", false); } diff --git a/src/org/torproject/android/service/TorServiceConstants.java b/src/org/torproject/android/service/TorServiceConstants.java index 8f8fc1b..ccc6c20 100644 --- a/src/org/torproject/android/service/TorServiceConstants.java +++ b/src/org/torproject/android/service/TorServiceConstants.java @@ -77,7 +77,7 @@ public interface TorServiceConstants { public static final int DISABLE_TOR_MSG = 3; public static final int LOG_MSG = 4; - public static final String BINARY_TOR_VERSION = "0.2.3.10-openssl-1.0.0f"; + public static final String BINARY_TOR_VERSION = "0.2.3.11-alpha-OBFS"; public static final String BINARY_PRIVOXY_VERSION = "1.4.13"; public static final String PREF_BINARY_TOR_VERSION_INSTALLED = "BINARY_TOR_VERSION_INTALLED"; public static final String PREF_BINARY_PRIVOXY_VERSION_INSTALLED = "BINARY_PRIVOXY_VERSION_INTALLED";

1 0

[orbot/master] Merge branch 'kensan/obfsbridge-prefs' into obfs
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit f2554207829268dd389c8c76507229a864d19ffd Merge: 48ea51f ab4f789 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sun Feb 12 13:05:19 2012 -0500 Merge branch 'kensan/obfsbridge-prefs' into obfs Conflicts: src/org/torproject/android/service/TorService.java res/values/strings.xml | 2 ++ res/xml/preferences.xml | 10 ++++++---- src/org/torproject/android/TorConstants.java | 1 + src/org/torproject/android/service/TorService.java | 18 ++++++++++++++---- 4 files changed, 23 insertions(+), 8 deletions(-)

1 0

[orbot/master] updated version
by n8fr8＠torproject.org 27 Feb '12

27 Feb '12

commit 78a00d9e2697e603c84137571868c45160266d41 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Feb 13 07:30:05 2012 -0500 updated version --- AndroidManifest.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 808fe37..245e7bc 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="0.2.3.11-alpha-1.0.7.1-OBFS-FA" - android:versionCode="33" + android:versionName="0.2.3.11-alpha-1.0.7.2-OBFS-FINAL" + android:versionCode="35" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" />

1 0