[tor-commits] [orbot/master] added, updated binaries and torrc

[n8fr8 at torproject.org]

commit 2c9d6864764ce679365d4f8f5085232fd6bc3771
Author: Nathan Freitas <nathan at freitas.net>
Date:   Sat Feb 11 04:06:57 2012 -0500

    added, updated binaries and torrc
---
 res/raw/obfsproxy |  Bin 0 -> 724091 bytes
 res/raw/tor       |  Bin 0 -> 4129189 bytes
 res/raw/tor.mp3   |  Bin 3466275 -> 0 bytes
 res/raw/torrc     |   19 +++++++++++++++++--
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/res/raw/obfsproxy b/res/raw/obfsproxy
new file mode 100755
index 0000000..ccab4ed
Binary files /dev/null and b/res/raw/obfsproxy differ
diff --git a/res/raw/tor b/res/raw/tor
new file mode 100755
index 0000000..6c9a338
Binary files /dev/null and b/res/raw/tor differ
diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3
deleted file mode 100644
index 2a99768..0000000
Binary files a/res/raw/tor.mp3 and /dev/null differ
diff --git a/res/raw/torrc b/res/raw/torrc
index f3d79d2..94c3a13 100644
--- a/res/raw/torrc
+++ b/res/raw/torrc
@@ -6,9 +6,24 @@ ControlPort 9051
 CookieAuthentication 1
 RelayBandwidthRate 20 KBytes
 RelayBandwidthBurst 20 KBytes
-UseBridges 0
 AutomapHostsOnResolve 1
 TransListenAddress 127.0.0.1
 TransPort 9040
 DNSListenAddress 127.0.0.1
-DNSPort 5400
\ No newline at end of file
+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
+ClientTransportPlugin obfs2 exec /data/data/org.torproject.android/app_bin/obfsproxy --managed