commit a809eb9aa01b9f78c365644f49c1c43500e00718 Author: Nathan Freitas nathan@freitas.net Date: Sun Feb 12 01:23:03 2012 -0500

added new default values for obfs bridges --- res/raw/torrc | 1 - res/values/strings.xml | 3 +++ res/xml/preferences.xml | 1 + 3 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/res/raw/torrc b/res/raw/torrc index 1d25634..93feb42 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,5 +11,4 @@ TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 DNSPort 5400 -UseBridges 1 ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed diff --git a/res/values/strings.xml b/res/values/strings.xml index 0ea4089..94299a1 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -256,4 +256,7 @@

<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> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 02beff4..15f3abc 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -101,6 +101,7 @@ android:summary="@string/enable_alternate_entrance_nodes_into_the_tor_network">< 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>