- tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.6.0esr-4.5-1] Revert "TB1: Add a string-based cacheKey."
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit 5ad57a0b24c85d19427eddebc2f647296063acfd Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 15 22:07:27 2015 -0700 Revert "TB1: Add a string-based cacheKey." This reverts commit 53f8f2506cb21bf1847a4261ef383db9be55a93c. This used to be used by Torbutton/SafeCache, but we moved the cache isolation to direct C++ patches instead. --- netwerk/base/public/nsICachingChannel.idl | 7 ------- netwerk/protocol/http/nsHttpChannel.cpp | 23 ----------------------- netwerk/protocol/http/nsHttpChannel.h | 1 - 3 files changed, 31 deletions(-) diff --git a/netwerk/base/public/nsICachingChannel.idl b/netwerk/base/public/nsICachingChannel.idl index 09b1f75..9c1b0a6 100644 --- a/netwerk/base/public/nsICachingChannel.idl +++ b/netwerk/base/public/nsICachingChannel.idl @@ -64,13 +64,6 @@ interface nsICachingChannel : nsICacheInfoChannel */ attribute nsISupports cacheKey; - /** - * Set/get the cache domain... uniquely identifies the data in the cache - * for this channel. Holding a reference to this key does NOT prevent - * the cached data from being removed. - */ - attribute AUTF8String cacheDomain; - /************************************************************************** * Caching channel specific load flags: */ diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp index 59ba71b..bba507e 100644 --- a/netwerk/protocol/http/nsHttpChannel.cpp +++ b/netwerk/protocol/http/nsHttpChannel.cpp @@ -3271,12 +3271,6 @@ nsHttpChannel::AssembleCacheKey(const char *spec, uint32_t postID, cacheKey.Append(buf); } - if (strlen(mCacheDomain.get()) > 0) { - cacheKey.AppendLiteral("domain="); - cacheKey.Append(mCacheDomain.get()); - cacheKey.AppendLiteral("&"); - } - if (!cacheKey.IsEmpty()) { cacheKey.AppendLiteral("uri="); } @@ -5563,23 +5557,6 @@ nsHttpChannel::SetCacheTokenCachedCharset(const nsACString &aCharset) PromiseFlatCString(aCharset).get()); } - -NS_IMETHODIMP -nsHttpChannel::GetCacheDomain(nsACString &value) -{ - value = mCacheDomain; - - return NS_OK; -} - -NS_IMETHODIMP -nsHttpChannel::SetCacheDomain(const nsACString &value) -{ - mCacheDomain = value; - - return NS_OK; -} - //----------------------------------------------------------------------------- // nsHttpChannel::nsICachingChannel //----------------------------------------------------------------------------- diff --git a/netwerk/protocol/http/nsHttpChannel.h b/netwerk/protocol/http/nsHttpChannel.h index a76ed8e..ef59c0b 100644 --- a/netwerk/protocol/http/nsHttpChannel.h +++ b/netwerk/protocol/http/nsHttpChannel.h @@ -354,7 +354,6 @@ private: nsCOMPtr<nsICacheEntry> mOfflineCacheEntry; uint32_t mOfflineCacheLastModifiedTime; nsCOMPtr<nsIApplicationCache> mApplicationCacheForWrite; - nsCString mCacheDomain; // auth specific data nsCOMPtr<nsIHttpChannelAuthProvider> mAuthProvider;

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] Merge remote-tracking branch 'arthur/13875' into tor-browser-31.6.0esr-4.5-1
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit 4c5a59914a15fa0795575f1f0b9ebe957bc52c65 Merge: 1a6eb58 a5648c8 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 15 18:41:42 2015 -0700 Merge remote-tracking branch 'arthur/13875' into tor-browser-31.6.0esr-4.5-1 dom/base/nsGlobalWindow.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #5856: Do not expose physical screen info via window & window.screen.
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit a5648c8d80f396caf294d761cc4a9a76c0b33a9d Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Wed Apr 8 22:55:41 2015 -0700 fixup! Bug #5856: Do not expose physical screen info via window & window.screen. --- dom/base/nsGlobalWindow.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 9fc9c31..2f85d60 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -4867,9 +4867,9 @@ nsGlobalWindow::GetOuterSize(ErrorResult& aError) MOZ_ASSERT(IsOuterWindow()); if (!IsChrome()) { - CSSIntSize size; - aError = GetInnerSize(size); - return nsIntSize(size.width, size.height); + CSSIntSize size; + aError = GetInnerSize(size); + return nsIntSize(size.width, size.height); } nsCOMPtr<nsIBaseWindow> treeOwnerAsWin = GetTreeOwnerWindow(); @@ -5114,6 +5114,11 @@ nsGlobalWindow::GetDevicePixelRatio(ErrorResult& aError) { FORWARD_TO_OUTER_OR_THROW(GetDevicePixelRatio, (aError), aError, 0.0); + // For non-chrome callers, always return 1.0 to prevent fingerprinting. + if (!IsChrome()) { + return 1.0; + } + if (!mDocShell) { return 1.0; }

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers.
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit 44cd9b47cb74544aa6eac4b1b0f3d4474457c3dc Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 14 10:27:02 2015 +0000 fixup! Bug #3455.2. Allow RFC1929 authentication (username/password) to SOCKS servers. --- netwerk/protocol/http/nsHttpConnectionInfo.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/netwerk/protocol/http/nsHttpConnectionInfo.cpp b/netwerk/protocol/http/nsHttpConnectionInfo.cpp index 2ef09b6..c602902 100644 --- a/netwerk/protocol/http/nsHttpConnectionInfo.cpp +++ b/netwerk/protocol/http/nsHttpConnectionInfo.cpp @@ -98,6 +98,11 @@ nsHttpConnectionInfo::SetOriginServer(const nsACString &host, int32_t port) // information so that a change in proxy config will mean this connection // is not reused + // NOTE: Adding the username and the password provides a means to isolate + // keep-alive to the URL bar domain as well: If the username is the URL bar + // domain, keep-alive connections are not reused by resources bound to + // different URL bar domains as the respective hash keys are not matching. + if ((!mUsingHttpProxy && ProxyHost()) || (mUsingHttpProxy && mUsingConnect)) { mHashKey.AppendLiteral(" (");

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 16 Apr '15

16 Apr '15

commit 1a6eb58a1d3cab67e371ac861d04ba526d4e6751 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Apr 14 10:31:39 2015 +0000 fixup! TB4: Tor Browser's Firefox preference overrides. We remove the keep-alive restriction now that we have isolation to the URL bar domain which is governing this as well (see: bug 4100). --- browser/app/profile/000-tor-browser.js | 1 - 1 file changed, 1 deletion(-) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 13bcf8e..192159b 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -132,7 +132,6 @@ pref("network.http.pipelining.maxrequests", 12); pref("network.http.pipelining.ssl", true); pref("network.http.proxy.pipelining", true); pref("security.ssl.enable_false_start", true); -pref("network.http.keep-alive.timeout", 20); pref("network.http.connection-retry-timeout", 0); pref("network.http.max-persistent-connections-per-proxy", 256); pref("network.http.pipelining.reschedule-timeout", 15000);

1 0

[tor-launcher/master] Merge branch 'bug13576-01'
by gk＠torproject.org 16 Apr '15

16 Apr '15

commit a37371ac9a866612e91a791251104184caad41ca Merge: b48d563 78f505c Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 15 20:01:36 2015 +0000 Merge branch 'bug13576-01' src/chrome/content/network-settings-overlay.xul | 5 ++--- src/chrome/content/network-settings.js | 13 +++++-------- src/chrome/skin/network-settings.css | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-)

1 0

[tor-launcher/master] Bug 13576: Tor Launcher strips "bridge" from the middle of bridge lines
by gk＠torproject.org 16 Apr '15

16 Apr '15

commit 78f505c2139341e71538e77a975f7df9f81189d0 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Mar 26 14:42:20 2015 -0400 Bug 13576: Tor Launcher strips "bridge" from the middle of bridge lines Change the code that strips "bridge" to work on a line-by-line basis. Do not add a "bridge " prefix when displaying bridge configuration lines. To reduce user confusion, turn off word wrap for the custom bridge textbox. Improve alignment within bridge settings UI. Windows: Increase width of Tor Network Settings wizard slightly so it is more likely that a bridge line with a fingerprint will fit. Mac OS: Use a slightly smaller font within the custom bridge textbox. --- src/chrome/content/network-settings-overlay.xul | 5 ++--- src/chrome/content/network-settings.js | 13 +++++-------- src/chrome/skin/network-settings.css | 10 ++++++++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/chrome/content/network-settings-overlay.xul b/src/chrome/content/network-settings-overlay.xul index 03171ec..af9ddf9 100644 --- a/src/chrome/content/network-settings-overlay.xul +++ b/src/chrome/content/network-settings-overlay.xul @@ -79,8 +79,7 @@ oncommand="onBridgeTypeRadioChange()"> <radio id="bridgeRadioDefault" label="&torsettings.useBridges.default;" selected="true" /> - <hbox align="baseline" style="margin-top: -5px"> - <spacer style="width: 1.9em" /> + <hbox id="bridgeDefaultEntry" align="baseline" style="margin-top: -5px"> <label id="defaultBridgeTypeLabel" value="&torsettings.useBridges.type;" control="defaultBridgeType"/> @@ -99,7 +98,7 @@ <vbox id="bridgeCustomEntry"> <label id="bridgeListLabel" style="margin-top:0px;" value="&torsettings.useBridges.label;" control="bridgeList"/> - <textbox id="bridgeList" multiline="true" rows="3" + <textbox id="bridgeList" multiline="true" rows="3" wrap="off" oninput="onCustomBridgesTextInput();" placeholder="&torsettings.useBridges.placeholder;" /> </vbox> diff --git a/src/chrome/content/network-settings.js b/src/chrome/content/network-settings.js index 3277553..e4ebeaa 100644 --- a/src/chrome/content/network-settings.js +++ b/src/chrome/content/network-settings.js @@ -69,6 +69,8 @@ function initDialog() var isWindows = TorLauncherUtil.isWindows; if (isWindows) document.documentElement.setAttribute("class", "os-windows"); + else if (TorLauncherUtil.isMac) + document.documentElement.setAttribute("class", "os-mac"); var forAssistance = document.getElementById("forAssistance"); if (forAssistance) @@ -1305,7 +1307,6 @@ function parseAndValidateBridges(aStr) return null; var resultStr = aStr; - resultStr = resultStr.replace(/bridge/gi, ""); // Remove "bridge" everywhere. resultStr = resultStr.replace(/\r\n/g, "\n"); // Convert \r\n pairs into \n. resultStr = resultStr.replace(/\r/g, "\n"); // Convert \r into \n. resultStr = resultStr.replace(/\n\n/g, "\n"); // Condense blank lines. @@ -1314,7 +1315,8 @@ function parseAndValidateBridges(aStr) var tmpArray = resultStr.split('\n'); for (var i = 0; i < tmpArray.length; i++) { - let s = tmpArray[i].trim(); // Remove extraneous whitespace. + let s = tmpArray[i].trim(); // Remove extraneous white space. + s = s.replace(/^bridge\s+/i, ""); // Remove "bridge " from start of line. resultArray.push(s); } @@ -1397,8 +1399,7 @@ function setElemValue(aID, aValue) // Returns true if one or more values were set. function setBridgeListElemValue(aBridgeArray) { - // To be consistent with bridges.torproject.org, pre-pend "bridge" to - // each line as it is displayed in the UI. + // Trim white space and only keep non-empty values. var bridgeList = []; if (aBridgeArray) { @@ -1406,11 +1407,7 @@ function setBridgeListElemValue(aBridgeArray) { var s = aBridgeArray[i].trim(); if (s.length > 0) - { - if (s.toLowerCase().indexOf("bridge") != 0) - s = "bridge " + s; bridgeList.push(s); - } } } diff --git a/src/chrome/skin/network-settings.css b/src/chrome/skin/network-settings.css index 331ae42..646baa6 100644 --- a/src/chrome/skin/network-settings.css +++ b/src/chrome/skin/network-settings.css @@ -24,7 +24,7 @@ wizard { } wizard.os-windows { - width: 46em; + width: 49em; height: 41em; } @@ -99,8 +99,14 @@ wizard[tor_hide_browser_logo="true"] .tbb-logo-separator { display: none; } +#bridgeDefaultEntry, #bridgeCustomEntry { - margin-left: 30px; + margin-left: 1.8em; +} + +dialog.os-mac #bridgeList, +wizard.os-mac #bridgeList { + font-size: 90%; } wizardpage[pageid="startingTor"] description,

1 0

[tor-browser-bundle/master] Bug 15670: add support for the no_update_for option in config.yml
by gk＠torproject.org 15 Apr '15

15 Apr '15

commit 7d7faa30b4443f0cc76474738a36fd3f45e875f4 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Apr 13 19:53:11 2015 +0200 Bug 15670: add support for the no_update_for option in config.yml --- tools/update-responses/update_responses | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 07efc7c..6c497ef 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -283,6 +283,10 @@ sub write_htaccess { my $version = $config->{channels}{$channel}; my $files = $config->{versions}{$version}{files}; $htaccess .= "RewriteRule ^[^\/]+/$version/ no-update.xml $flags\n"; + my $noup_for = $config->{no_update_for}{$channel}; + for my $noup_ver (ref $noup_for eq 'ARRAY' ? @$noup_for : ()) { + $htaccess .= "RewriteRule ^[^\/]+/$noup_ver/ no-update.xml $flags\n"; + } foreach my $os (sort keys %$files) { my $bt = build_target_by_os($os); foreach my $lang (sort keys %{$files->{$os}}) {

1 0

[tor-launcher/master] Bug 15657: display host:port if HOSTADDR is provided by Tor.
by gk＠torproject.org 15 Apr '15

15 Apr '15

commit b48d563eaa58b2c423b1eba09aa712787ba5a559 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Fri Apr 10 18:00:23 2015 -0400 Bug 15657: display host:port if HOSTADDR is provided by Tor. If a Tor bootstrap status message contains a HOSTADDR value, include it within the error alert that we display. Also fix a problem where the progress dialog stayed open after an error occurred (even though an error alert was displayed as soon as the user clicked the "Cancel" button). --- src/chrome/content/progress.js | 13 ++++++++++--- src/components/tl-process.js | 7 ++++--- src/components/tl-protocol.js | 3 ++- src/modules/tl-util.jsm | 5 ++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/chrome/content/progress.js b/src/chrome/content/progress.js index 30c4370..8208398 100644 --- a/src/chrome/content/progress.js +++ b/src/chrome/content/progress.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -9,6 +9,7 @@ const Cu = Components.utils; const kTorProcessExitedTopic = "TorProcessExited"; const kBootstrapStatusTopic = "TorBootstrapStatus"; +const kTorBootstrapErrorTopic = "TorBootstrapError"; const kTorLogHasWarnOrErrTopic = "TorLogHasWarnOrErr"; Cu.import("resource://gre/modules/XPCOMUtils.jsm"); @@ -42,6 +43,7 @@ function initDialog() .getService(Ci.nsIObserverService); gObsSvc.addObserver(gObserver, kTorProcessExitedTopic, false); gObsSvc.addObserver(gObserver, kBootstrapStatusTopic, false); + gObsSvc.addObserver(gObserver, kTorBootstrapErrorTopic, false); gObsSvc.addObserver(gObserver, kTorLogHasWarnOrErrTopic, false); } catch (e) {} @@ -85,6 +87,7 @@ function cleanup() { gObsSvc.removeObserver(gObserver, kTorProcessExitedTopic); gObsSvc.removeObserver(gObserver, kBootstrapStatusTopic); + gObsSvc.removeObserver(gObserver, kTorBootstrapErrorTopic); gObsSvc.removeObserver(gObserver, kTorLogHasWarnOrErrTopic); } } @@ -132,10 +135,14 @@ var gObserver = { // nsIObserver implementation. observe: function(aSubject, aTopic, aParam) { - if (kTorProcessExitedTopic == aTopic) + if ((kTorProcessExitedTopic == aTopic) || + (kTorBootstrapErrorTopic == aTopic)) { + // In these cases, an error alert will be displayed elsewhere so it is + // best to close this window. // TODO: provide a way to access tor log e.g., leave this dialog open - // and display the open settings button. + // and display the open settings button or provide a way to do + // that from our error alerts. cleanup(); window.close(); } diff --git a/src/components/tl-process.js b/src/components/tl-process.js index b6dc98f..ef2b12c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -524,10 +524,11 @@ TorProcessService.prototype = this.mLastTorWarningPhase = aStatusObj.TAG; this.mLastTorWarningReason = aStatusObj.REASON; + // Notify others that an error will be displayed. + this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason); + var msg = TorLauncherUtil.getLocalizedString("tor_bootstrap_failed"); TorLauncherUtil.showAlert(null, msg + "\n\n" + details); - - this.mObsSvc.notifyObservers(null, "TorBootstrapError", reason); } } } diff --git a/src/components/tl-protocol.js b/src/components/tl-protocol.js index 09ec468..559bb37 100644 --- a/src/components/tl-protocol.js +++ b/src/components/tl-protocol.js @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // TODO: Some code came from torbutton.js (pull in copyright and license?) // @@ -310,6 +310,7 @@ TorProtocolService.prototype = // status.REASON -- string (optional) // status.COUNT -- integer (optional) // status.RECOMMENDATION -- string (optional) + // status.HOSTADDR -- string (optional) // A "TorBootstrapStatus" notification is also sent. // Returns null upon failure. _parseBootstrapStatus: function(aStatusMsg) diff --git a/src/modules/tl-util.jsm b/src/modules/tl-util.jsm index 834d260..ac680a8 100644 --- a/src/modules/tl-util.jsm +++ b/src/modules/tl-util.jsm @@ -1,4 +1,4 @@ -// Copyright (c) 2014, The Tor Project, Inc. +// Copyright (c) 2015, The Tor Project, Inc. // See LICENSE for licensing information. // // vim: set sw=2 sts=2 ts=8 et syntax=javascript: @@ -182,6 +182,9 @@ let TorLauncherUtil = // Public if (!result) result = fallbackStr; + if ((aKeyword == "REASON") && aStatusObj.HOSTADDR) + result += " - " + aStatusObj.HOSTADDR; + return (result) ? result : ""; },

1 0

[tor-browser-bundle/master] Update meek to 0.17.
by gk＠torproject.org 11 Apr '15

11 Apr '15

commit 25dc8d416325f01ca046a70afc115e57c37c7b43 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Apr 5 23:36:27 2015 +0000 Update meek to 0.17. Removes --exit-on-stdin-eof from meek-client-torbrowser command; now handled by the TOR_PT_EXIT_ON_STDIN_CLOSE environment variable. --- Bundle-Data/PTConfigs/windows/torrc-defaults-appendix | 2 +- gitian/versions | 2 +- gitian/versions.alpha | 2 +- gitian/versions.beta | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix index f287e3e..ad1eb07 100644 --- a/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix +++ b/Bundle-Data/PTConfigs/windows/torrc-defaults-appendix @@ -12,4 +12,4 @@ ClientTransportPlugin obfs2,obfs3,obfs4,scramblesuit exec TorBrowser\Tor\Pluggab ClientTransportPlugin flashproxy exec TorBrowser\Tor\PluggableTransports\flashproxy-client --register :0 :9000 ## meek configuration -ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser --exit-on-stdin-eof -- TorBrowser\Tor\PluggableTransports\meek-client +ClientTransportPlugin meek exec TorBrowser\Tor\PluggableTransports\terminateprocess-buffer TorBrowser\Tor\PluggableTransports\meek-client-torbrowser -- TorBrowser\Tor\PluggableTransports\meek-client diff --git a/gitian/versions b/gitian/versions index 4b0c9a4..a2f7817 100755 --- a/gitian/versions +++ b/gitian/versions @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GITIAN_TAG=tor-browser-builder-3.x-7 diff --git a/gitian/versions.alpha b/gitian/versions.alpha index 6976ea8..ee69d08 100755 --- a/gitian/versions.alpha +++ b/gitian/versions.alpha @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 FAKETIME_TAG=70aa6b394d9341522dffe8a5a5cf5929e82cc6b9 # unsigned v0.9.6 GOED25519_TAG=c4161f4c7483313562781c61b9a20aba73daf9de GOSIPHASH_TAG=42ba037e748c9062a75e0924705c43b893edefcd diff --git a/gitian/versions.beta b/gitian/versions.beta index efb4bfb..673b2e5 100755 --- a/gitian/versions.beta +++ b/gitian/versions.beta @@ -25,7 +25,7 @@ FTEPROXY_TAG=597f8378f6f4f3de570b8e1064c2e4cb8d67fbd0 # tag 0.2.19 LIBDMG_TAG=dfd5e5cc3dc1191e37d3c3a6118975afdd1d7014 TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0.2 GOPTLIB_TAG=0.2 -MEEK_TAG=0.16 +MEEK_TAG=0.17 GITIAN_TAG=tor-browser-builder-3.x-6

1 0

[torbutton/master] Bug #15651: Restore deleted line in comment
by gk＠torproject.org 11 Apr '15

11 Apr '15

commit 1b2b3ee19651a18141563ce3d4b69a9f506689fb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Apr 10 05:53:16 2015 +0100 Bug #15651: Restore deleted line in comment The deletion occured in c48bf013150c6a5cd0bfc17cf219615824208f44 --- src/chrome/content/torbutton.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 7d6486f..b4b3ab5 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -1,3 +1,4 @@ +// Bug 1506 P0-P5: This is the main Torbutton overlay file. Much needs to be // preserved here, but in an ideal world, most of this code should perhaps be // moved into an XPCOM service, and much can also be tossed. See also // individual 1506 comments for details.

1 0

[tor-browser-bundle/maint-4.0] 4.0.8 will be incremental from 4.0.6 only, since 4.0.7 thinks its 4.0.6.
by mikeperry＠torproject.org 09 Apr '15

09 Apr '15

commit d4e10e98af5237ed21796a4d48c3e09db6994959 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 8 11:27:06 2015 -0700 4.0.8 will be incremental from 4.0.6 only, since 4.0.7 thinks its 4.0.6. --- tools/update-responses/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 7d5c391..3470616 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,13 +6,13 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.7 + release: 4.0.8 alpha: 4.5-alpha-2 versions: - 4.0.7: + 4.0.8: platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.7 + download_url: https://www.torproject.org/dist/torbrowser/4.0.8 incremental_from: - 4.0.6 4.5-alpha-2:

1 0

[tor-browser-bundle/maint-4.0] Update changelog and versions for 4.0.8.
by mikeperry＠torproject.org 09 Apr '15

09 Apr '15

commit 41f93db41d60f7ecc036e9916c9af1dbcda7c7d5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Wed Apr 8 11:18:31 2015 -0700 Update changelog and versions for 4.0.8. --- Bundle-Data/Docs/ChangeLog.txt | 4 ++++ gitian/versions | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index c0630a0..9df5a76 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 4.0.8 -- Apr 10 2015 + * All Platforms + * Bug 15637: Fix update loop + Tor Browser 4.0.7 -- Apr 9 2015 * All Platforms * Update Tor to 0.2.5.12 diff --git a/gitian/versions b/gitian/versions index 121fc41..78e5414 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0.7 +TORBROWSER_VERSION=4.0.8 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1

1 0

[tor-browser-bundle/maint-4.0] Update NoScript once again.
by mikeperry＠torproject.org 08 Apr '15

08 Apr '15

commit 9edd486bd6f83fdbd2fd7a43966ccabd39a0a552 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 7 14:17:36 2015 -0700 Update NoScript once again. --- Bundle-Data/Docs/ChangeLog.txt | 2 +- gitian/versions | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index eb89707..c0630a0 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,7 +1,7 @@ Tor Browser 4.0.7 -- Apr 9 2015 * All Platforms * Update Tor to 0.2.5.12 - * Update NoScript to 2.6.9.20 + * Update NoScript to 2.6.9.21 Tor Browser 4.0.6 -- Mar 31 2015 * All Platforms diff --git a/gitian/versions b/gitian/versions index 7e280c5..121fc41 100755 --- a/gitian/versions +++ b/gitian/versions @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.20-sm+fn+fx.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.21-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=daa2ac5e23728cd9d5fd39130673422b054b45d0d55237c08276e73fb3740bfe +NOSCRIPT_HASH=165704af79afb609dcb8d9eeb525be90a31e17a0b577f508b624c9098fd15c4c HTTPSE_HASH=30891fc7bd73213a4d8386c44fc53ab8037c9ec3d4b90caefbe6a7558ef7ac2c MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[tor-browser-bundle/maint-4.0] Update the update_responses config for 4.0.7.
by mikeperry＠torproject.org 08 Apr '15

08 Apr '15

commit d24e8e313966f03ffef11752a57a3158d8f947bf Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Apr 7 12:21:23 2015 -0700 Update the update_responses config for 4.0.7. --- tools/update-responses/config.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 682f5cc..7d5c391 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -6,16 +6,15 @@ build_targets: osx32: Darwin_x86-gcc3 osx64: Darwin_x86_64-gcc3 channels: - release: 4.0.6 + release: 4.0.7 alpha: 4.5-alpha-2 versions: - 4.0.6: + 4.0.7: platformVersion: 31.6.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en - download_url: https://www.torproject.org/dist/torbrowser/4.0.6 + download_url: https://www.torproject.org/dist/torbrowser/4.0.7 incremental_from: - - 4.0.4 - - 4.0.5 + - 4.0.6 4.5-alpha-2: platformVersion: 31.3.0 detailsURL: https://www.torproject.org/projects/torbrowser.html.en

1 0

[tor-browser-bundle/maint-4.0] Prep 4.0.7 for Tor update.
by mikeperry＠torproject.org 07 Apr '15

07 Apr '15

commit 7a7f2b736c41882a6e9dbd6a911490771b5ea97a Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Apr 6 23:52:09 2015 -0700 Prep 4.0.7 for Tor update. --- Bundle-Data/Docs/ChangeLog.txt | 5 +++++ gitian/versions | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index e7707cb..eb89707 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,8 @@ +Tor Browser 4.0.7 -- Apr 9 2015 + * All Platforms + * Update Tor to 0.2.5.12 + * Update NoScript to 2.6.9.20 + Tor Browser 4.0.6 -- Mar 31 2015 * All Platforms * Update Firefox to 31.6.0esr diff --git a/gitian/versions b/gitian/versions index 5d41491..7e280c5 100755 --- a/gitian/versions +++ b/gitian/versions @@ -1,4 +1,4 @@ -TORBROWSER_VERSION=4.0.6 +TORBROWSER_VERSION=4.0.7 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN" BUILD_PT_BUNDLES=1 @@ -9,7 +9,7 @@ FIREFOX_VERSION=31.6.0esr TORBROWSER_UPDATE_CHANNEL=release TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1 -TOR_TAG=tor-0.2.5.11 +TOR_TAG=tor-0.2.5.12 TORLAUNCHER_TAG=0.2.7.0.2 TORBUTTON_TAG=1.7.0.2 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630 @@ -53,7 +53,7 @@ GO_VER=1.3.3 ## File names for the source packages OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2 -NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.19-fx+fn+sm.xpi +NOSCRIPT_PACKAGE=noscript_security_suite-2.6.9.20-sm+fn+fx.xpi HTTPSE_PACKAGE=https-everywhere-${HTTPSE_VER}.xpi TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz @@ -81,7 +81,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160 OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9 -NOSCRIPT_HASH=2579b91fb2f5491a12c49e543a9d2b2583dc82e2393ce1b0ab92b170dcc7c6ad +NOSCRIPT_HASH=daa2ac5e23728cd9d5fd39130673422b054b45d0d55237c08276e73fb3740bfe HTTPSE_HASH=30891fc7bd73213a4d8386c44fc53ab8037c9ec3d4b90caefbe6a7558ef7ac2c MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c

1 0

[torbutton/master] Bug #14429, Part 2. Run quantizer only once per window
by gk＠torproject.org 06 Apr '15

06 Apr '15

commit 046bce076aea058e41dfc05e7949429bdf800a2b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sun Mar 29 23:09:27 2015 -0700 Bug #14429, Part 2. Run quantizer only once per window --- src/chrome/content/content-sizer.js | 14 ++++++-------- src/chrome/content/torbutton.js | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/content-sizer.js b/src/chrome/content/content-sizer.js index af6bc80..f3710f7 100644 --- a/src/chrome/content/content-sizer.js +++ b/src/chrome/content/content-sizer.js @@ -5,10 +5,10 @@ /* jshint esnext: true */ -// __quantizeBrowserSizeOnLoad(window, xStep, yStep)__. -// Once a window is fully loaded, ensures that gBrowser width and height are multiples of +// __quantizeBrowserSize(window, xStep, yStep)__. +// Ensures that gBrowser width and height are multiples of // xStep and yStep. -let quantizeBrowserSizeOnLoad = function (window, xStep, yStep) { +let quantizeBrowserSize = function (window, xStep, yStep) { // Use Task.jsm to avoid callback hell. Cu.import("resource://gre/modules/Task.jsm"); @@ -247,7 +247,7 @@ let updateDimensions = function (gBrowser, xStep, yStep) { // __quantizeBrowserSizeNow(window, xStep, yStep)__. // Ensures that gBrowser width and height are multiples of xStep and yStep, and always as // large as possible inside the chrome window. -let quantizeBrowserSizeNow = function (window, xStep, yStep) { +let quantizeBrowserSizeMain = function (window, xStep, yStep) { let gBrowser = window.gBrowser, container = window.gBrowser.parentElement, updater = event => updateDimensions(gBrowser, xStep, yStep), @@ -278,9 +278,7 @@ let quantizeBrowserSizeNow = function (window, xStep, yStep) { bindPrefAndInit("extensions.torbutton.resize_windows", activate); }; -let onLoad = () => quantizeBrowserSizeNow(window, xStep, yStep); -window.gBrowser.addEventListener("load", onLoad, true); -return () => window.gBrowser.removeEventListener("load", onLoad, true); +quantizeBrowserSizeMain(window, xStep, yStep); -// quantizeBrowserSizeOnLoad +// quantizeBrowserSize }; diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index c071ec3..7d6486f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -636,7 +636,7 @@ function torbutton_init() { createTorCircuitDisplay(m_tb_control_host, m_tb_control_port, m_tb_control_pass, "extensions.torbutton.display_circuit"); - quantizeBrowserSizeOnLoad(window, 200, 100); + quantizeBrowserSize(window, 200, 100); torbutton_log(3, 'init completed'); }

1 0

[torbutton/master] use correct function name
by gk＠torproject.org 06 Apr '15

06 Apr '15

commit c16e185af35ea05b0612e1453541fb6cadd5111b Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 2 17:44:51 2015 -0700 use correct function name --- src/chrome/content/torbutton.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 44f62aa..ffa214f 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2221,7 +2221,7 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 0); } - pref("security.enable_tls_session_tickets", !mode); + m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !mode); // Force prefs to be synced to disk var prefService = Components.classes["@mozilla.org/preferences-service;1"]

1 0

[torbutton/master] Bug 15562: Bind SharedWorkers to thirdparty pref
by gk＠torproject.org 06 Apr '15

06 Apr '15

commit d8d7f2a0d36407d1461666487238b2321e506db4 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 2 17:47:05 2015 -0700 Bug 15562: Bind SharedWorkers to thirdparty pref --- src/chrome/content/torbutton.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index ffa214f..c071ec3 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -2221,6 +2221,7 @@ function torbutton_update_thirdparty_prefs() { m_tb_prefs.setIntPref("network.cookie.cookieBehavior", 0); } + m_tb_prefs.setBoolPref("dom.workers.sharedWorkers.enabled", !mode); m_tb_prefs.setBoolPref("security.enable_tls_session_tickets", !mode); // Force prefs to be synced to disk

1 0

[tor-browser/tor-browser-31.6.0esr-4.5-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by gk＠torproject.org 06 Apr '15

06 Apr '15

commit ff924f41b59068793d0785229619c33a2baa10ff Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Thu Apr 2 15:14:37 2015 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. --- browser/app/profile/000-tor-browser.js | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/app/profile/000-tor-browser.js b/browser/app/profile/000-tor-browser.js index 0198b98..13bcf8e 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -95,6 +95,7 @@ pref("network.http.spdy.enabled", false); // Stores state and may have keepalive pref("network.http.spdy.enabled.v2", false); // Seems redundant, but just in case pref("network.http.spdy.enabled.v3", false); // Seems redundant, but just in case pref("privacy.thirdparty.isolate", 2); // Always enforce third party isolation +pref("dom.workers.sharedWorkers.enabled", false); // See https://bugs.torproject.org/15562 // Proxy and proxy security pref("network.proxy.socks", "127.0.0.1");

1 0

[torbutton/master] Bug 15533: Restore default security level
by gk＠torproject.org 02 Apr '15

02 Apr '15

commit 4f230f0344aa622de506766f65f4584e319ca49e Author: Georg Koppen <gk(a)torproject.org> Date: Wed Apr 1 12:30:33 2015 +0000 Bug 15533: Restore default security level We changed the position of the security levels ("High" is now on top and "Low" on bottom) but forgot to adapt the logic responsible for restoring the default one (i.e. "Low"). --- src/chrome/content/preferences.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/chrome/content/preferences.js b/src/chrome/content/preferences.js index be77793..1ac89da 100644 --- a/src/chrome/content/preferences.js +++ b/src/chrome/content/preferences.js @@ -458,7 +458,7 @@ function torbutton_prefs_reset_defaults() { // Resetting the Security Slider preferences o_torprefs.setBoolPref('security_custom', false); - o_torprefs.setIntPref('security_slider', 1); + o_torprefs.setIntPref('security_slider', 4); chrome.torbutton_update_security_slider(); torbutton_log(4, "Preferences reset to defaults");

1 0

[tor-browser-bundle/master] Correct the 4.0.6 changelog entry.
by mikeperry＠torproject.org 01 Apr '15

01 Apr '15

commit f0e347d9bc11e0de91350fadc2e7e703e2380e17 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Tue Mar 31 13:56:51 2015 -0700 Correct the 4.0.6 changelog entry. --- Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 0292d82..056caf3 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -52,6 +52,7 @@ Tor Browser 4.0.6 -- Mar 31 2015 * All Platforms * Update Firefox to 31.6.0esr * Update meek to 0.16 + * Update OpenSSL to 1.0.1m Tor Browser 4.0.5 -- Mar 23 2015 * All Platforms

1 0

[torbutton/master] Fix small typo in comment
by gk＠torproject.org 31 Mar '15

31 Mar '15

commit fc0c8ed76346f2bb0b4d139ca444cbc404df5d07 Author: Georg Koppen <gk(a)torproject.org> Date: Tue Mar 31 07:33:51 2015 +0000 Fix small typo in comment --- src/modules/tor-control-port.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index e4c7d16..de9f10a 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -606,7 +606,7 @@ event.messageToData = function (type, message) { // __event.watchEvent(controlSocket, type, filter, onData)__. // Watches for a particular type of event. If filter(data) returns true, the event's -// data is pass to the onData callback. Returns a zero arg function that +// data is passed to the onData callback. Returns a zero arg function that // stops watching the event. event.watchEvent = function (controlSocket, type, filter, onData) { return controlSocket.addNotificationCallback(new RegExp("^650." + type, "i"),

1 0

[torbutton/master] Bug #15510: Detach event watchers when finished
by gk＠torproject.org 31 Mar '15

31 Mar '15

commit f0e1d504dbf57f0c0041ae14f32a5a092a8a1afe Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Mar 30 14:50:27 2015 -0700 Bug #15510: Detach event watchers when finished --- src/chrome/content/tor-circuit-display.js | 15 +++++++++++---- src/modules/tor-control-port.js | 10 +++++----- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index 917f1f0..4197944 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -129,7 +129,7 @@ let getCircuitStatusByID = function* (aController, circuitID) { // corresponding circuit. Whenever the first stream on a new circuit is seen, // looks up u+p and records the node data in the credentialsToNodeDataMap. let collectIsolationData = function (aController) { - aController.watchEvent( + return aController.watchEvent( "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", streamEvent => Task.spawn(function* () { @@ -313,10 +313,13 @@ let syncDisplayWithSelectedTab = (function() { // A reference to this function (called createTorCircuitDisplay) is exported as a global. let setupDisplay = function (host, port, password, enablePrefName) { let myController = null, + stopCollectingIsolationData = null, stop = function() { if (myController) { syncDisplayWithSelectedTab(false); - myController.close(); + if (stopCollectingIsolationData) { + stopCollectingIsolationData(); + } myController = null; } }, @@ -326,16 +329,20 @@ let setupDisplay = function (host, port, password, enablePrefName) { // An error has occurred. logger.eclog(5, err); logger.eclog(5, "Disabling tor display circuit because of an error."); + myController.close(); stop(); }); syncDisplayWithSelectedTab(true); - collectIsolationData(myController); + stopCollectingIsolationData = collectIsolationData(myController); } }; try { let unbindPref = bindPrefAndInit(enablePrefName, on => { if (on) start(); else stop(); }); // When this chrome window is unloaded, we need to unbind the pref. - window.addEventListener("unload", unbindPref); + window.addEventListener("unload", function () { + unbindPref(); + stop(); + }); } catch (e) { logger.eclog(5, "Error: " + e.message + "\n" + e.stack); } diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index 710643e..e4c7d16 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -606,9 +606,10 @@ event.messageToData = function (type, message) { // __event.watchEvent(controlSocket, type, filter, onData)__. // Watches for a particular type of event. If filter(data) returns true, the event's -// data is pass to the onData callback. +// data is pass to the onData callback. Returns a zero arg function that +// stops watching the event. event.watchEvent = function (controlSocket, type, filter, onData) { - controlSocket.addNotificationCallback(new RegExp("^650." + type, "i"), + return controlSocket.addNotificationCallback(new RegExp("^650." + type, "i"), function (message) { let data = event.messageToData(type, message); if (filter === null || filter(data)) { @@ -635,9 +636,8 @@ tor.controller = function (host, port, password, onError) { return { getInfo : key => info.getInfo(socket, key), getInfoMultiple : keys => info.getInfoMultiple(socket, keys), getConf : key => info.getConf(socket, key), - watchEvent : function (type, filter, onData) { - event.watchEvent(socket, type, filter, onData); - }, + watchEvent : (type, filter, onData) => + event.watchEvent(socket, type, filter, onData), isOpen : () => isOpen, close : () => { isOpen = false; socket.close(); } };

1 0

[torbutton/master] Bug #15472: Make node text black in circuit status UI.
by gk＠torproject.org 30 Mar '15

30 Mar '15

commit 6f5b6ea7b976c678ac1032378653f3dc286582e0 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Mar 27 20:34:34 2015 -0700 Bug #15472: Make node text black in circuit status UI. --- src/chrome/skin/tor-circuit-display.css | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/chrome/skin/tor-circuit-display.css b/src/chrome/skin/tor-circuit-display.css index 004a68f..fc18f05 100644 --- a/src/chrome/skin/tor-circuit-display.css +++ b/src/chrome/skin/tor-circuit-display.css @@ -1,16 +1,16 @@ /* -This CSS file is for styling the tor circuit display. It consists of a title, +This CSS file is for styling the tor circuit display, which consists of a title, a domain, and a bulleted list. Each bullet in the circuit node list is supposed to represent a Tor circuit node, and lines drawn between them to represent Tor network inter-relay connections. -CSS for line between bullets is Derived in part from https://jsfiddle.net/5JP8Q/ - -Color the background to make circuit display distinct from the rest of popup. +CSS for line between bullets is derived in part from https://jsfiddle.net/5JP8Q/ */ -/* The circuit-display div encloses all other HTML elements. */ +/* The circuit-display div encloses all other HTML elements. + Color the background to make circuit display distinct + from the rest of the popup. */ div#circuit-display { background-color: #e8f4f4; font-family: Arial; @@ -40,6 +40,7 @@ div#circuit-display p#domain { ul#circuit-nodes { font-family: Arial; font-size: 14px; + color: black; margin-top: 8px; padding-left: 8px; padding-right: 8px;

1 0