[tor-commits] [torbrowser/master] temporarily switch OSX and Linux to fixed ports

[erinn at torproject.org]

commit 3bb947a1a92cc3e4f3e1e8823452799b9d309c5a
Author: Erinn Clark <erinn at torproject.org>
Date:   Wed Sep 12 10:47:22 2012 +0100

    temporarily switch OSX and Linux to fixed ports
---
 build-scripts/config/alpha/torrc-linux             |    2 --
 build-scripts/config/alpha/torrc-obfsproxy-linux   |    2 --
 build-scripts/config/alpha/torrc-obfsproxy-osx     |    2 --
 build-scripts/config/alpha/torrc-osx               |    2 --
 build-scripts/config/alpha/vidalia.conf.ff-linux   |    1 -
 .../config/alpha/vidalia.conf.ff-obfsproxy-linux   |    1 -
 .../config/alpha/vidalia.conf.ff-obfsproxy-osx     |    1 -
 build-scripts/config/alpha/vidalia.conf.ff-osx     |    1 -
 8 files changed, 0 insertions(+), 12 deletions(-)

diff --git a/build-scripts/config/alpha/torrc-linux b/build-scripts/config/alpha/torrc-linux
index 05f5345..70731eb 100644
--- a/build-scripts/config/alpha/torrc-linux
+++ b/build-scripts/config/alpha/torrc-linux
@@ -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/alpha/torrc-obfsproxy-linux b/build-scripts/config/alpha/torrc-obfsproxy-linux
index 59ca799..6da8871 100644
--- a/build-scripts/config/alpha/torrc-obfsproxy-linux
+++ b/build-scripts/config/alpha/torrc-obfsproxy-linux
@@ -8,9 +8,7 @@ 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
 
 UseBridges 1
 
diff --git a/build-scripts/config/alpha/torrc-obfsproxy-osx b/build-scripts/config/alpha/torrc-obfsproxy-osx
index 80d343d..6310dca 100644
--- a/build-scripts/config/alpha/torrc-obfsproxy-osx
+++ b/build-scripts/config/alpha/torrc-obfsproxy-osx
@@ -8,9 +8,7 @@ GeoIPFile ../../Contents/Resources/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
 
 UseBridges 1
 
diff --git a/build-scripts/config/alpha/torrc-osx b/build-scripts/config/alpha/torrc-osx
index 4c7f0d9..984fbfe 100644
--- a/build-scripts/config/alpha/torrc-osx
+++ b/build-scripts/config/alpha/torrc-osx
@@ -8,6 +8,4 @@ GeoIPFile ../../Contents/Resources/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/alpha/vidalia.conf.ff-linux b/build-scripts/config/alpha/vidalia.conf.ff-linux
index 26c66be..402e7f4 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-linux
+++ b/build-scripts/config/alpha/vidalia.conf.ff-linux
@@ -12,5 +12,4 @@ DefaultPluginsDirectory=./extensions
 ControlPort=9051
 TorExecutable=./tor
 Torrc=../Data/Tor/torrc
-AutoControl=true
 DataDirectory=../Data/Tor
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
index cb97dc2..73e6ea9 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
+++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-linux
@@ -12,7 +12,6 @@ DefaultPluginsDirectory=./extensions
 ControlPort=9051
 TorExecutable=./tor
 Torrc=../Data/Tor/torrc
-AutoControl=true
 DataDirectory=../Data/Tor
 
 [Network]
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx
index 833fbe4..5a4f6d6 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx
+++ b/build-scripts/config/alpha/vidalia.conf.ff-obfsproxy-osx
@@ -11,7 +11,6 @@ LanguageCode=en
 ControlPort=9051
 TorExecutable=../../../tor
 Torrc=../../../../../Library/Vidalia/torrc
-AutoControl=true
 DataDirectory=../../../../Resources/Data/Tor/
 
 [Network]
diff --git a/build-scripts/config/alpha/vidalia.conf.ff-osx b/build-scripts/config/alpha/vidalia.conf.ff-osx
index f698d2b..d501c5f 100644
--- a/build-scripts/config/alpha/vidalia.conf.ff-osx
+++ b/build-scripts/config/alpha/vidalia.conf.ff-osx
@@ -11,5 +11,4 @@ LanguageCode=en
 ControlPort=9051
 TorExecutable=../../../tor
 Torrc=../../../../../Library/Vidalia/torrc
-AutoControl=true
 DataDirectory=../../../../Resources/Data/Tor/