This project is archived. Its data is read-only.

Commit 423c8ef7 authored Oct 22, 2012 by Erinn Clark

Revert "temporarily switch OSX and Linux to fixed ports"

This reverts commit 3bb947a1.

parent f618d9f1

build-scripts/config/alpha/torrc-linux

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,4 +8,6 @@ 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

build-scripts/config/alpha/torrc-obfsproxy-linux

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,7 +8,9 @@ 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

build-scripts/config/alpha/torrc-obfsproxy-osx

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,7 +8,9 @@ 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

build-scripts/config/alpha/torrc-osx

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,4 +8,6 @@ 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

build-scripts/config/alpha/vidalia.conf.ff-linux

+1 −0

Original line number	Diff line number	Diff line
		@@ -12,4 +12,5 @@ DefaultPluginsDirectory=./extensions
		ControlPort=9051
		TorExecutable=./tor
		Torrc=../Data/Tor/torrc
		AutoControl=true
		DataDirectory=../Data/Tor