September 2014 - tbb-commits - lists.torproject.org

[tor-browser/tor-browser-31.1.1esr-4.x-1] fixup! TB4: Tor Browser's Firefox preference overrides.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 3a25e7d56006b2ddfcd30cd310df87d9e09f6d3c Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:34:57 2014 -0700 fixup! TB4: Tor Browser's Firefox preference overrides. Bug 13023: Disable the gamepad API. --- 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 9739f87..c885dae 100644 --- a/browser/app/profile/000-tor-browser.js +++ b/browser/app/profile/000-tor-browser.js @@ -76,6 +76,7 @@ pref("plugin.expose_full_path", false); pref("browser.zoom.siteSpecific", false); pref("intl.charset.default", "windows-1252"); pref("browser.link.open_newwindow.restriction", 0); // Bug 9881: Open popups in new tabs (to avoid fullscreen popups) +pref("dom.gamepad.enabled", false); // bugs.torproject.org/13023 // pref("intl.accept_languages", "en-us, en"); // Set by Torbutton // pref("intl.accept_charsets", "iso-8859-1,*,utf-8"); // Set by Torbutton // pref("intl.charsetmenu.browser.cache", "UTF-8"); // Set by Torbutton

1 0

[tor-browser-bundle/master] Point nightlies at FF31ESR.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit d6cbef12af2a177cb8d715c00bc9c3f1fa81f5b5 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:53:39 2014 -0700 Point nightlies at FF31ESR. --- gitian/versions.nightly | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitian/versions.nightly b/gitian/versions.nightly index 1d3285d..4d4c4f5 100755 --- a/gitian/versions.nightly +++ b/gitian/versions.nightly @@ -4,7 +4,7 @@ BUILD_PT_BUNDLES=1 VERIFY_TAGS=0 -FIREFOX_VERSION=24.8.0esr +FIREFOX_VERSION=31.1.1esr TORBROWSER_UPDATE_CHANNEL=default @@ -27,7 +27,7 @@ TXSOCKSX_TAG=216eb0894a1755872f4789f9458aa6cf543b8433 # unsigned habnabit/1.13.0 GOPTLIB_TAG=master MEEK_TAG=master -GITIAN_TAG=tor-browser-builder-3.x-6 +GITIAN_TAG=tor-browser-builder-3.x-7 OPENSSL_VER=1.0.1i GMP_VER=5.1.3

1 0

[tor-browser-bundle/master] Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 11d174291621350e9f5524ee416c74597ccef660 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 18:26:42 2014 -0700 Bug #12873: Re-enable TLSv1.1 and v1.2 for Meek. --- Bundle-Data/PTConfigs/meek-http-helper-user.js | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Bundle-Data/PTConfigs/meek-http-helper-user.js b/Bundle-Data/PTConfigs/meek-http-helper-user.js index 26fd819..cddc237 100644 --- a/Bundle-Data/PTConfigs/meek-http-helper-user.js +++ b/Bundle-Data/PTConfigs/meek-http-helper-user.js @@ -4,14 +4,6 @@ // to stdout. user_pref("browser.dom.window.dump.enabled", true); -// Make TLSv1.0 the maximum TLS version, as in stock Firefox 24. Since #11253, -// Tor Browser overrides the maximum to TLSv1.2, which would cause us to look -// unlike ordinary Firefox 24. -// https://trac.torproject.org/projects/tor/ticket/11253 -// https://trac.torproject.org/projects/tor/ticket/12766 -// http://kb.mozillazine.org/Security.tls.version.* -user_pref("security.tls.version.max", 1); - // Enable TLS session tickets (disabled by default in Tor Browser). Otherwise // there is a missing TLS extension. // https://trac.torproject.org/projects/tor/ticket/11183#comment:9

1 0

[torbutton/master] Merge remote-tracking branch 'gk/bug_12947'
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit fd5b793ce1d1922411cf632bd0a53139e26efdc8 Merge: 3f80c17 3831da2 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:25:27 2014 -0700 Merge remote-tracking branch 'gk/bug_12947' src/components/tbSessionStore.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)

1 0

[torbutton/master] Update changelog.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit beb9d71b5a101523474e9c72ff75419065ccd326 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:25:37 2014 -0700 Update changelog. --- src/CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CHANGELOG b/src/CHANGELOG index 11c50a7..74e95fe 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -2,6 +2,7 @@ ?? * Bug 10751: Adapt Torbutton to ESR31's Australis UI. * Bug 13138: ESR31-about:tor shows "Tor is not working" + * Bug 12947: Adapt session storage blocker to ESR 31. 1.6.12.3 23 Sep 2014

1 0

[torbutton/master] Bug 12947: Adapt session storage blocker to ESR 31.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 3831da21b6bac9e6cf21ba7d4e48217a6b14e73a Author: Georg Koppen <gk(a)torproject.org> Date: Fri Sep 5 16:12:23 2014 +0000 Bug 12947: Adapt session storage blocker to ESR 31. --- src/components/tbSessionStore.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/tbSessionStore.js b/src/components/tbSessionStore.js index 039e223..7281bcf 100644 --- a/src/components/tbSessionStore.js +++ b/src/components/tbSessionStore.js @@ -85,8 +85,15 @@ TBSessionBlocker.prototype = { if (topic != "sessionstore-state-write") return; this.logger.log(3, "Got Session Store observe: "+topic); - subject = subject.QueryInterface(Ci.nsISupportsString); - + // In ESR 31 |subject| is |null| in non-private browsing mode. Thus, we + // are not able to clean anything. In Private Browsing Mode nothing is + // written in the first place and therefore no |sessionstore-state-write| + // notification is emitted. + try { + subject = subject.QueryInterface(Ci.nsISupportsString); + } catch (e) { + this.logger.log(3, "We got no data to clean"); + } // Bug 1506: This is the only important bit, other than // the registration goop. You don't even need the JSON // garbage...

1 0

[torbutton/master] Update changelog and version for 1.7.0.0-pre.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 3f80c17eb67f2836c1652f43f693e0a99c152747 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:22:56 2014 -0700 Update changelog and version for 1.7.0.0-pre. --- src/CHANGELOG | 5 +++++ src/install.rdf | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 1f925c6..11c50a7 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,8 @@ +1.7.0.0 + ?? + * Bug 10751: Adapt Torbutton to ESR31's Australis UI. + * Bug 13138: ESR31-about:tor shows "Tor is not working" + 1.6.12.3 23 Sep 2014 * Bug 10804: Workaround for some TBB startup hangs diff --git a/src/install.rdf b/src/install.rdf index bf5ec16..2411179 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry</em:creator> <em:id>torbutton(a)torproject.org</em:id> - <em:version>1.6.12.3</em:version> + <em:version>1.7.0.0-pre</em:version> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Merge remote-tracking branch 'brade/bug13138'
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit f82606e56c30ee7db9e6160719ef858b7b9c1e10 Merge: 7f46869 0467379 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Sep 29 17:06:48 2014 -0700 Merge remote-tracking branch 'brade/bug13138' src/chrome/content/aboutTor/aboutTor.xhtml | 7 ++++- src/chrome/content/torbutton.js | 45 ++++++++++++++++++---------- 2 files changed, 35 insertions(+), 17 deletions(-)

1 0

[torbutton/master] Bug 13138: ESR31-about:tor shows "Tor is not working"
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit 0467379f524273ed810b5c21d6a8eb16d00445cb Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Thu Sep 11 14:10:55 2014 -0400 Bug 13138: ESR31-about:tor shows "Tor is not working" In Firefox 26 and newer, the BrowserOnAboutPageLoad() function that Torbutton previously used to detect about:tor page loads has been removed. The new approach is to have about:tor dispatch a custom event (which is the same approach Mozilla uses for about:home). --- src/chrome/content/aboutTor/aboutTor.xhtml | 7 ++++++- src/chrome/content/torbutton.js | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/chrome/content/aboutTor/aboutTor.xhtml b/src/chrome/content/aboutTor/aboutTor.xhtml index f8f829d..c13f60e 100644 --- a/src/chrome/content/aboutTor/aboutTor.xhtml +++ b/src/chrome/content/aboutTor/aboutTor.xhtml @@ -21,7 +21,7 @@ <title>&aboutTor.title;</title> <link rel="stylesheet" type="text/css" media="all" href="chrome://torbutton/skin/aboutTor.css"/> -<script type="text/javascript"> +<script type="text/javascript;version=1.7"> <![CDATA[ function onLoad() { @@ -125,6 +125,11 @@ function insertPropertyStrings() } catch(e) {}; } +window.addEventListener("pageshow", function() { + let evt = new CustomEvent("AboutTorLoad", { bubbles: true }); + document.dispatchEvent(evt); +}); + ]]> </script> </head> diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4ca6614..9b7ade2 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -506,9 +506,10 @@ function torbutton_init() { } } - // Add our hook into about page load - m_tb_orig_BrowserOnAboutPageLoad = window.BrowserOnAboutPageLoad; - window.BrowserOnAboutPageLoad = torbutton_override_BrowserOnAboutPageLoad; + // Add event listener for about:tor page loads. + document.addEventListener("AboutTorLoad", function(aEvent) { + torbutton_on_abouttor_load(aEvent.target); + }, false, true); // initialize preferences before we start our prefs observer torbutton_init_prefs(); @@ -966,7 +967,7 @@ function torbutton_update_abouttor_arrow(aDoc) { } catch(e) {} } -function torbutton_override_BrowserOnAboutPageLoad(aDoc) { +function torbutton_on_abouttor_load(aDoc) { if (torbutton_is_abouttor_doc(aDoc) && !aDoc.documentElement.hasAttribute("aboutTorLoaded")) { aDoc.documentElement.setAttribute("aboutTorLoaded", true);

1 0

[torbutton/master] Bug #10751.1: Load HUDService only if it's not already available.
by mikeperry＠torproject.org 30 Sep '14

30 Sep '14

commit f5095267fcc638bd5ded6f9934e31d98505a6247 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Mon Aug 25 15:50:19 2014 -0700 Bug #10751.1: Load HUDService only if it's not already available. Loading by this method breaks the browser console in ESR31. Fortunately, ESR31 has a built-in window.HUDService. --- src/chrome/content/torbutton.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 4cd9c3d..153cc3c 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -6,8 +6,13 @@ // TODO: Double-check there are no strange exploits to defeat: // http://kb.mozillazine.org/Links_to_local_pages_don%27t_work -XPCOMUtils.defineLazyModuleGetter(this, "HUDService", - "resource:///modules/HUDService.jsm"); +// TODO: Remove the following HUDService loading code once TBB-ESR24 has +// been retired. +if (!window.hasOwnProperty("HUDService")) { + XPCOMUtils.defineLazyModuleGetter(this, "HUDService", + "resource:///modules/HUDService.jsm"); +} + XPCOMUtils.defineLazyModuleGetter(this, "ConsoleServiceListener", "resource://gre/modules/devtools/WebConsoleUtils.jsm"); XPCOMUtils.defineLazyModuleGetter(this, "WebConsoleUtils", @@ -2605,8 +2610,8 @@ var torbutton_console_observer = { observe: function(subject, topic, data) { if (topic === "web-console-created") { - var id = subject.QueryInterface(Ci.nsISupportsString).toString(); - var con = HUDService.getHudReferenceById(subject); + var id = subject.QueryInterface(Ci.nsISupportsString).toString(), + con = HUDService.getHudReferenceById(id); con.ui.reportPageErrorOld = con.ui.reportPageError; // Filtering the messages by making them hidden adding the // "hidden-message" class. If the message does not need to get filtered

1 0