[tor-commits] [torbrowser/master] update configuration files for polipo removal

[erinn at torproject.org]

commit 7e01282d38b95689ba98471a59a35a8ff9af1283
Author: Erinn Clark <erinn at torproject.org>
Date:   Thu Feb 3 21:19:29 2011 +0100

    update configuration files for polipo removal
---
 build-scripts/config/torrc-osx           |    1 +
 build-scripts/config/vidalia.conf.ff-osx |    3 ---
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx
index 984fbfe..9d32985 100644
--- a/build-scripts/config/torrc-osx
+++ b/build-scripts/config/torrc-osx
@@ -8,4 +8,5 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
+SocksPort 9050
 SocksListenAddress 127.0.0.1
diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx
index c038242..b261d9e 100644
--- a/build-scripts/config/vidalia.conf.ff-osx
+++ b/build-scripts/config/vidalia.conf.ff-osx
@@ -2,9 +2,6 @@
 BrowserDirectory=../../
 BrowserExecutable=firefox-bin
 LanguageCode=en
-ProxyExecutable=../../Contents/MacOS/polipo
-ProxyExecutableArguments=-c ../../Contents/Resources/Data/Polipo/polipo.conf
-RunProxyAtStart=true
 
 [Tor]
 ControlPort=9051