[tor-commits] [torbrowser/master] revert automatic port selection for windows tbbs (#3945)

[erinn at torproject.org]

commit 550edc2fe0267348190f381110163e6b2bae9f93
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Sep 7 03:22:40 2011 +0100

    revert automatic port selection for windows tbbs (#3945)
---
 build-scripts/config/torrc           |    2 --
 build-scripts/config/vidalia.conf.ff |    1 -
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc
index 143c71a..2d63da9 100644
--- a/build-scripts/config/torrc
+++ b/build-scripts/config/torrc
@@ -8,6 +8,4 @@ GeoIPFile .\Data\Tor\geoip
 Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
-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 d66f53f..d03289e 100644
--- a/build-scripts/config/vidalia.conf.ff
+++ b/build-scripts/config/vidalia.conf.ff
@@ -7,5 +7,4 @@ LanguageCode=en
 ControlPort=9051
 TorExecutable=.\\App\\tor.exe
 Torrc=.\\Data\\Tor\\torrc
-AutoControl=true
 DataDirectory=.\\Data\\Tor