[tor-commits] [torbrowser/maint-2.2] add auto port selection to windows config files

[erinn at torproject.org]

commit 9f30b4174acda826297b0e75c3e25dfabc164250
Author: Erinn Clark <erinn at torproject.org>
Date:   Sun Aug 28 20:42:52 2011 +0100

    add auto port selection to windows config files
---
 build-scripts/config/torrc           |    3 ++-
 build-scripts/config/vidalia.conf.ff |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc
index 29154fb..143c71a 100644
--- a/build-scripts/config/torrc
+++ b/build-scripts/config/torrc
@@ -8,5 +8,6 @@ GeoIPFile .\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 b/build-scripts/config/vidalia.conf.ff
index 03ed00a..d66f53f 100644
--- a/build-scripts/config/vidalia.conf.ff
+++ b/build-scripts/config/vidalia.conf.ff
@@ -7,3 +7,5 @@ LanguageCode=en
 ControlPort=9051
 TorExecutable=.\\App\\tor.exe
 Torrc=.\\Data\\Tor\\torrc
+AutoControl=true
+DataDirectory=.\\Data\\Tor