[tor-commits] [orbot/master] update binaries and torrc for obfs/PT work

[n8fr8 at torproject.org]

commit 21c1cadccab8076481260e072b676ca870cadeb1
Author: Nathan Freitas <nathan at freitas.net>
Date:   Fri Apr 25 12:44:37 2014 -0400

    update binaries and torrc for obfs/PT work
---
 res/raw/obfsclient.mp3 |  Bin 3318009 -> 807052 bytes
 res/raw/polipo.mp3     |  Bin 312051 -> 123224 bytes
 res/raw/tor.mp3        |  Bin 1815448 -> 1708250 bytes
 res/raw/torrc          |    5 -----
 res/raw/xtables.mp3    |  Bin 166343 -> 152674 bytes
 5 files changed, 5 deletions(-)

diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3
index da065cb..1782cde 100644
Binary files a/res/raw/obfsclient.mp3 and b/res/raw/obfsclient.mp3 differ
diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3
index 69fdf9f..6f0fc28 100644
Binary files a/res/raw/polipo.mp3 and b/res/raw/polipo.mp3 differ
diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3
index 56bd825..dc4266e 100644
Binary files a/res/raw/tor.mp3 and b/res/raw/tor.mp3 differ
diff --git a/res/raw/torrc b/res/raw/torrc
index 85d6b86..e68d169 100644
--- a/res/raw/torrc
+++ b/res/raw/torrc
@@ -1,8 +1,3 @@
-SocksPort 9050
-SOCKSListenAddress 127.0.0.1
-SafeSocks 0
-TestSocks 1
-WarnUnsafeSocks 1
 Log notice stdout
 ControlListenAddress 127.0.0.1
 ControlPort 9051
diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3
index 4bd634b..caab569 100644
Binary files a/res/raw/xtables.mp3 and b/res/raw/xtables.mp3 differ