- tor-commits - lists.torproject.org

[torbrowser/master] Bug #3907: Provide Auth headers to on-modify-request
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit cf3b2270e3d6961d2fc8951f13d8093b9965bf3e Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Sep 2 15:52:58 2011 -0700 Bug #3907: Provide Auth headers to on-modify-request Bug #3748 isn't fully solved without this patch. Thanks again to Georg Koppen. --- ...th-headers-before-the-modify-request-obse.patch | 51 ++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/src/current-patches/0006-Add-HTTP-auth-headers-before-the-modify-request-obse.patch b/src/current-patches/0006-Add-HTTP-auth-headers-before-the-modify-request-obse.patch new file mode 100644 index 0000000..3f270d6 --- /dev/null +++ b/src/current-patches/0006-Add-HTTP-auth-headers-before-the-modify-request-obse.patch @@ -0,0 +1,51 @@ +From 8c2bf692deecb4efbfd2e9c4eba1d702b89a0f05 Mon Sep 17 00:00:00 2001 +From: Mike Perry <mikeperry-git(a)fscked.org> +Date: Fri, 2 Sep 2011 15:33:20 -0700 +Subject: [PATCH 6/6] Add HTTP auth headers before the modify-request observer. + +Otherwise, how are we supposed to modify them? + +Thanks to Georg Koppen for spotting both the problem and this fix. +--- + netwerk/protocol/http/nsHttpChannel.cpp | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp +index 7038338..7a3254e 100644 +--- a/netwerk/protocol/http/nsHttpChannel.cpp ++++ b/netwerk/protocol/http/nsHttpChannel.cpp +@@ -311,9 +311,6 @@ nsHttpChannel::Connect(PRBool firstTime) + return NS_ERROR_DOCUMENT_NOT_CACHED; + } + +- // check to see if authorization headers should be included +- mAuthProvider->AddAuthorizationHeaders(); +- + if (mLoadFlags & LOAD_NO_NETWORK_IO) { + return NS_ERROR_DOCUMENT_NOT_CACHED; + } +@@ -3687,6 +3684,9 @@ nsHttpChannel::AsyncOpen(nsIStreamListener *listener, nsISupports *context) + + AddCookiesToRequest(); + ++ // check to see if authorization headers should be included ++ mAuthProvider->AddAuthorizationHeaders(); ++ + // notify "http-on-modify-request" observers + gHttpHandler->OnModifyRequest(this); + +@@ -4758,7 +4758,10 @@ nsHttpChannel::DoAuthRetry(nsAHttpConnection *conn) + // this authentication attempt (bug 84794). + // TODO: save cookies from auth response and send them here (bug 572151). + AddCookiesToRequest(); +- ++ ++ // check to see if authorization headers should be included ++ mAuthProvider->AddAuthorizationHeaders(); ++ + // notify "http-on-modify-request" observers + gHttpHandler->OnModifyRequest(this); + +-- +1.7.3.4 +

1 0

[torbrowser/master] update windows and linux to 2.2.32-1 as well
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 17c0d034c0e078a9a4e6353a2e7a8279d4f3a72b Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:21:48 2011 +0100 update windows and linux to 2.2.32-1 as well --- README.LINUX-2.2 | 6 +++--- README.WIN-2.2 | 8 ++++---- build-scripts/windows.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.win-2.2 | 11 ++++++++++- 5 files changed, 27 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 47f2684..176ee30 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,10 +4,10 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) Firefox (Aurora) 6.0 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 519c64f..5ab55a0 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) -FirefoxPortable 5.0.1 +Vidalia 0.2.14 (with Qt 4.6.2) +Tor 0.2.2.32 (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-1.0.0d) +FirefoxPortable 6.0 \_ Firefox (Aurora) 6.0 - \_ Torbutton 1.4.0 + \_ Torbutton 1.4.1 |_ NoScript 2.1.2.6 |_ HTTPS-Everywhere 1.0.0development.5 diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 1a52f6a..294b2c6 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -138,7 +138,7 @@ NAME="Tor Browser" DISTDIR=tbbwin-alpha-dist ## Version and name of the compressed bundle (also used for source) -VERSION=$(RELEASE_VER)-2-alpha +VERSION=$(RELEASE_VER)-1-alpha DEFAULT_COMPRESSED_BASENAME=tor-browser-$(VERSION) IM_COMPRESSED_BASENAME=tor-im-browser-$(VERSION) DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME) diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index 1d29228..6d49e4a 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.32-1) alpha; suite=linux + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + Tor Browser Bundle (2.2.31-2) alpha; suite=linux * Fix x86_64 bundle to have the right libraries and binaries (closes: #3773) diff --git a/changelog.win-2.2 b/changelog.win-2.2 index bc070ec..96eae99 100644 --- a/changelog.win-2.2 +++ b/changelog.win-2.2 @@ -1,4 +1,13 @@ -Tor Browser Bundle (2.2.30-1) alpha; suite=windows +Tor Browser Bundle (2.2.32-1) alpha; suite=windows + + * Update Tor to 0.2.2.32 + * Update Vidalia to 0.2.14 + * Update Torbutton to 1.4.1 + * Enable automatic port choosing (closes: #2264) + + -- Erinn Clark <erinn(a)torproject.org> Sun Aug 28 17:20:46 BST 2011 + +Tor Browser Bundle (2.2.31-1) alpha; suite=windows * Update Tor to 0.2.2.31-rc * Update Firefox to 6.0

1 0

[torbrowser/master] give windows an updated prefs.js as well
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 0eddd4ad3c37bd8a49030e65bbff0367534b9865 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:22:15 2011 +0100 give windows an updated prefs.js as well --- build-scripts/config/windows-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/windows-4.0.js b/build-scripts/config/windows-4.0.js index 13fda1f..a9cbdc8 100644 --- a/build-scripts/config/windows-4.0.js +++ b/build-scripts/config/windows-4.0.js @@ -38,7 +38,7 @@ user_pref("browser.places.migratePostDataAnnotations", false); user_pref("browser.places.smartBookmarksVersion", 2); user_pref("browser.places.updateRecentTagsUri", false); user_pref("browser.preferences.advanced.selectedTabIndex", 0); -user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.privatebrowsing.autostart", false); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); @@ -50,7 +50,7 @@ user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); -user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.urlbar.autocomplete.enabled", true); user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); @@ -149,6 +149,7 @@ user_pref("noscript.showTemp", false); user_pref("noscript.showTempAllowPage", false); user_pref("noscript.showTempToPerm", false); user_pref("noscript.showUntrusted", false); +user_pref("noscript.STS.enabled", false); user_pref("noscript.subscription.lastCheck", -142148139); user_pref("noscript.temp", ""); user_pref("noscript.untrusted", "");

1 0

[torbrowser/master] make tbb write its version into the prefs.js file (closes: #3654)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 017ca6774ee2defa22e93fbbe00f3bf7000c9111 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:37:29 2011 +0100 make tbb write its version into the prefs.js file (closes: #3654) --- build-scripts/osx.mk | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index 0b07e67..2e8b290 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -351,9 +351,8 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref write-tbb-version final touch bundle-localized_$*.stamp - cp extensions/torbutton.xpi . bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -433,5 +432,8 @@ update-extension-pref: ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q;}' $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + final: mv $(BUNDLE) $(BUNDLE).app

1 0

[torbrowser/master] give windows and linux the ability to write their tbb version into prefs.js too
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 703a9aa38e53d4d043fe9c8d6c4566eca2ee8693 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 19:24:58 2011 +0100 give windows and linux the ability to write their tbb version into prefs.js too --- build-scripts/linux.mk | 6 +++++- build-scripts/windows.mk | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 659e3b0..85f8830 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -392,7 +392,8 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language \ + patch-pidgin-language update-extension-pref write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -466,3 +467,6 @@ update-extension-pref: ext_ver=$$(sed -n '/em:version/{s,.*="$.*$".*,\1,p;q}' $(BUNDLE)/Data/profile/extensions/langpack-$(LANGCODE)(a)firefox.mozilla.org/install.rdf) \ sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 294b2c6..2016242 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -360,7 +360,8 @@ split-bundle_%: LANGCODE=$* make -f windows.mk split-bundle-localized bundle-localized_%.stamp: - make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript patch-vidalia-language patch-firefox-language patch-pidgin-language + make -f windows.mk copy-files_$* install-extensions install-torbutton install-httpseverywhere install-noscript \ + patch-vidalia-language patch-firefox-language patch-pidgin-language write-tbb-version touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp @@ -439,6 +440,9 @@ patch-firefox-language: apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) +write-tbb-version: + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME) SRCDEST=/tmp

1 0

[torbrowser/master] enable auto port choosing (closes: #2264)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 1e3792839c3bdb1f11755a32faa3e122d9c038ba Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:48 2011 +0100 enable auto port choosing (closes: #2264) --- build-scripts/config/torrc-osx | 3 ++- build-scripts/config/vidalia.conf.ff-osx | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc-osx b/build-scripts/config/torrc-osx index 9d32985..4c7f0d9 100644 --- a/build-scripts/config/torrc-osx +++ b/build-scripts/config/torrc-osx @@ -8,5 +8,6 @@ GeoIPFile ../../Contents/Resources/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-osx b/build-scripts/config/vidalia.conf.ff-osx index b261d9e..2c40be6 100644 --- a/build-scripts/config/vidalia.conf.ff-osx +++ b/build-scripts/config/vidalia.conf.ff-osx @@ -7,3 +7,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=../../Contents/MacOS/tor Torrc=../../Library/Vidalia/torrc +AutoControl=true +DataDirectory=../../Contents/Resources/Data/Tor

1 0

[torbrowser/master] update prefs.js (closes: #3545, #3818, #3339)
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 80578211b0031a47c429105ed2d8c3c4dc92ae65 Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 17:36:11 2011 +0100 update prefs.js (closes: #3545, #3818, #3339) --- build-scripts/config/no-polipo-4.0.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build-scripts/config/no-polipo-4.0.js b/build-scripts/config/no-polipo-4.0.js index 2437752..bea5d44 100644 --- a/build-scripts/config/no-polipo-4.0.js +++ b/build-scripts/config/no-polipo-4.0.js @@ -38,7 +38,7 @@ user_pref("browser.places.migratePostDataAnnotations", false); user_pref("browser.places.smartBookmarksVersion", 2); user_pref("browser.places.updateRecentTagsUri", false); user_pref("browser.preferences.advanced.selectedTabIndex", 0); -user_pref("browser.privatebrowsing.autostart", true); +user_pref("browser.privatebrowsing.autostart", false); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); @@ -49,7 +49,7 @@ user_pref("browser.shell.checkDefaultBrowser", false); user_pref("browser.startup.homepage", "https://check.torproject.org/?lang=en-US&small=1"); user_pref("browser.startup.homepage_override.buildID", "20110325121920"); user_pref("browser.startup.homepage_override.mstone", "rv:2.0"); -user_pref("browser.urlbar.autocomplete.enabled", false); +user_pref("browser.urlbar.autocomplete.enabled", true); user_pref("browser.zoom.siteSpecific", false); user_pref("capability.policy.maonoscript.javascript.enabled", "allAccess"); user_pref("capability.policy.maonoscript.sites", "addons.mozilla.org about: about:addons about:blank about:blocked about:certerror about:config about:crashes about:credits about:home about:neterror about:plugins about:privatebrowsing about:sessionrestore chrome: resource:"); @@ -136,6 +136,7 @@ user_pref("noscript.showTemp", false); user_pref("noscript.showTempAllowPage", false); user_pref("noscript.showTempToPerm", false); user_pref("noscript.showUntrusted", false); +user_pref("noscript.STS.enabled", false); user_pref("noscript.subscription.lastCheck", -142148139); user_pref("noscript.temp", ""); user_pref("noscript.untrusted", "");

1 0

[torbrowser/master] add auto port selection to windows config files
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 9f30b4174acda826297b0e75c3e25dfabc164250 Author: Erinn Clark <erinn(a)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

1 0

[torbrowser/master] use the right paths for adding tbb version in prefs.js on windows and linux
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit 1907b9e7455eaaa1fbd0aed614aeab55b2d6fdae Author: Erinn Clark <erinn(a)torproject.org> Date: Sun Aug 28 20:37:03 2011 +0100 use the right paths for adding tbb version in prefs.js on windows and linux --- build-scripts/linux.mk | 3 ++- build-scripts/windows.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index 85f8830..904aed7 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -468,5 +468,6 @@ update-extension-pref: sed -i -e "s/SHPONKA/langpack-$(LANGCODE)@firefox.mozilla.org:$$ext_ver/g" $(BUNDLE)/Data/profile/prefs.js write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/App/Firefox/defaults/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Data/profile/prefs.js diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk index 2016242..da1384e 100644 --- a/build-scripts/windows.mk +++ b/build-scripts/windows.mk @@ -441,7 +441,8 @@ apply-prefs: cp $(DEST)/FirefoxPortable/Data/profile/prefs.js $(CONFIG_SRC) write-tbb-version: - printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/Library/Application\ Support/Firefox/Profiles/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/App/DefaultData/profile/prefs.js + printf 'user_pref("torbrowser.version", "%s");\n' "$(RELEASE_VER)" >> $(BUNDLE)/FirefoxPortable/Data/profile/prefs.js ## Export the source code of the bundle SRCNAME=$(COMPRESSED_NAME)

1 0

[torbrowser/master] add autoport configuration to linux config files
by erinn＠torproject.org 23 Oct '11

23 Oct '11

commit f6288fccc8c0275f75d16d2afc5ca5437b6f01ff Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 29 23:41:51 2011 +0100 add autoport configuration to linux config files --- build-scripts/config/torrc-linux | 3 ++- build-scripts/config/vidalia.conf.ff-linux | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc-linux b/build-scripts/config/torrc-linux index 9c6cecd..05f5345 100644 --- a/build-scripts/config/torrc-linux +++ b/build-scripts/config/torrc-linux @@ -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-linux b/build-scripts/config/vidalia.conf.ff-linux index 94c5503..4535b7b 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -8,3 +8,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=./App/tor Torrc=./Data/Tor/torrc +AutoControl=true +DataDirectory=./Data/Tor

1 0