[tor-commits] [torbrowser/master] WIN: update stable config files for FF17+torbutton changes

[erinn at torproject.org]

commit 41b7e1db3340734e36504861f42a7a24e65d922a
Author: Erinn Clark <erinn at torproject.org>
Date:   Tue Feb 12 16:51:55 2013 +0100

    WIN: update stable config files for FF17+torbutton changes
---
 build-scripts/config/torrc           |    2 ++
 build-scripts/config/vidalia.conf.ff |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/build-scripts/config/torrc b/build-scripts/config/torrc
index 2d63da9..16f9486 100644
--- a/build-scripts/config/torrc
+++ b/build-scripts/config/torrc
@@ -9,3 +9,5 @@ Log notice stdout
 # Bind to this address to listen to connections from SOCKS-speaking
 # applications.
 SocksListenAddress 127.0.0.1
+SocksPort 9150
+ControlPort 9151
diff --git a/build-scripts/config/vidalia.conf.ff b/build-scripts/config/vidalia.conf.ff
index 1d9d2fa..d557a0c 100644
--- a/build-scripts/config/vidalia.conf.ff
+++ b/build-scripts/config/vidalia.conf.ff
@@ -8,7 +8,7 @@ PluginsDirectory=..\\..\\Data\\plugins
 DefaultPluginsDirectory=..\\DefaultData\\plugins
 
 [Tor]
-ControlPort=9051
+ControlPort=9151
 TorExecutable=.\\tor.exe
 Torrc=..\\Data\\Tor\\torrc
 DataDirectory=..\\Data\\Tor