[tor-commits] [torbrowser/maint-2.2] enable auto port choosing (closes: #2264)

[erinn at torproject.org]

commit 1e3792839c3bdb1f11755a32faa3e122d9c038ba
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 28 17:36:48 2011 +0100

    enable auto port choosing (closes: #2264)
---
 build-scripts/config/torrc-osx           |    3 ++-
 build-scripts/config/vidalia.conf.ff-osx |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx
index 9d32985..4c7f0d9 100644
--- a/build-scripts/config/torrc-osx
+++ b/build-scripts/config/torrc-osx
@@ -8,5 +8,6 @@ GeoIPFile ../../Contents/Resources/Data/Tor/geoip
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-SocksPort 9050
+SocksPort auto
 SocksListenAddress 127.0.0.1
+ControlPort auto
diff --git a/build-scripts/config/vidalia.conf.ff-osx b/build-scripts/config/vidalia.conf.ff-osx
index b261d9e..2c40be6 100644
--- a/build-scripts/config/vidalia.conf.ff-osx
+++ b/build-scripts/config/vidalia.conf.ff-osx
@@ -7,3 +7,5 @@ LanguageCode=en
 ControlPort=9051
 TorExecutable=../../Contents/MacOS/tor
 Torrc=../../Library/Vidalia/torrc
+AutoControl=true
+DataDirectory=../../Contents/Resources/Data/Tor