commit 834188a22eef636473cedfffd3a2acc17b202d90 Author: Nathan Freitas nathan@freitas.net Date: Sat Feb 11 22:38:32 2012 -0500

updating binaries and config files --- res/raw/obfsproxy | Bin 724091 -> 724091 bytes res/raw/tor | Bin 4129189 -> 0 bytes res/raw/torrc | 16 +--------------- res/xml/preferences.xml | 2 +- 4 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy index ccab4ed..4ff390d 100755 Binary files a/res/raw/obfsproxy and b/res/raw/obfsproxy differ diff --git a/res/raw/tor b/res/raw/tor deleted file mode 100755 index 6c9a338..0000000 Binary files a/res/raw/tor and /dev/null differ diff --git a/res/raw/torrc b/res/raw/torrc index 94c3a13..1d25634 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -11,19 +11,5 @@ TransListenAddress 127.0.0.1 TransPort 9040 DNSListenAddress 127.0.0.1 DNSPort 5400 -UseBridges 1 -bridge obfs2 38.229.33.18:42401 -bridge obfs2 85.17.20.242:61264 -bridge obfs2 85.214.131.213:1051 -bridge obfs2 86.59.30.35:45605 -bridge obfs2 91.208.34.7:5353 -bridge obfs2 109.105.109.163:53999 -bridge obfs2 109.163.233.195:1051 -bridge obfs2 128.30.30.25:51420 -bridge obfs2 128.31.0.34:1051 -bridge obfs2 131.215.158.1:29936 -bridge obfs2 173.254.192.38:1051 -bridge obfs2 188.40.20.215:32982 -bridge obfs2 212.112.242.160:49259 -bridge obfs2 213.108.105.129:36609 +UseBridges 1 ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 40955db..02beff4 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -92,7 +92,7 @@ android:summary="@string/use_only_these_specified_nodes"/> </PreferenceCategory> <PreferenceCategory android:title="@string/bridges">

-<CheckBoxPreference android:defaultValue="false" +<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>