- tbb-commits - lists.torproject.org

[torbutton/master] Release preparations for 2.0.6
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit 8e70b5f35f59ba6bbb563fbef2a4853c4d657580 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 1 20:37:47 2018 +0000 Release preparations for 2.0.6 Version bump and CHANGELOG update --- src/CHANGELOG | 3 +++ src/install.rdf | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CHANGELOG b/src/CHANGELOG index 3494e98a..c9f24cbd 100644 --- a/src/CHANGELOG +++ b/src/CHANGELOG @@ -1,3 +1,6 @@ +2.0.6 + * Bug 27401: Start listening for NoScript before it loads + 2.0.5 * Bug 26962: Circuit display onboarding * Bug 26520: Fix sec slider/NoScript for TOR_SKIP_LAUNCH=1 diff --git a/src/install.rdf b/src/install.rdf index e64cde33..a92cd651 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>2.0.5</em:version> + <em:version>2.0.6</em:version> <em:multiprocessCompatible>true</em:multiprocessCompatible> <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] Revert "fixup! Bug 26961: New user onboarding."
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit c79bb726065ce296d567a6c9ac58b37b7d750318 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 1 20:29:42 2018 +0000 Revert "fixup! Bug 26961: New user onboarding." This reverts commit 8b50d3f2f1bb5ce04ebf3a91ff701059fedb2da2. --- browser/extensions/onboarding/content/onboarding.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 4212e305a505..1f46abdb722d 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count"; const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished"; const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog"; -const ONBOARDING_MIN_WIDTH_PX = 200; -const SPEECH_BUBBLE_MIN_WIDTH_PX = 200; +const ONBOARDING_MIN_WIDTH_PX = 960; +const SPEECH_BUBBLE_MIN_WIDTH_PX = 960; const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2"; const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2"; const ICON_STATE_WATERMARK = "watermark"; @@ -629,7 +629,6 @@ class Onboarding { tour_type: this._tourType, }); - this._resizeUI(); this._window.addEventListener("beforeunload", this); this._window.addEventListener("unload", this); this._window.addEventListener("resize", this); @@ -643,7 +642,7 @@ class Onboarding { } _resizeUI() { - this._windowWidth = this._window.innerWidth; + this._windowWidth = this._window.document.body.getBoundingClientRect().width; if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) { // Don't show the overlay UI before we get to a better, responsive design. this.destroy();

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! squash! Bug 26961: New user onboarding.
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit 839cc4bd054821fe7e4c093f0a05986b83491985 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Sep 1 20:20:51 2018 +0000 fixup! squash! Bug 26961: New user onboarding. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. --- browser/extensions/onboarding/content/onboarding.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index dd776b3edf93..9d03a6fc82d8 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count"; const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished"; const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog"; -const ONBOARDING_MIN_WIDTH_PX = 960; -const SPEECH_BUBBLE_MIN_WIDTH_PX = 960; +const ONBOARDING_MIN_WIDTH_PX = 200; +const SPEECH_BUBBLE_MIN_WIDTH_PX = 200; const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2"; const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2"; const ICON_STATE_WATERMARK = "watermark";

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] squash! Bug 26961: New user onboarding.
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit cd00a313475584c0a4b94eaea5171428b993ce5b Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Sat Sep 1 14:51:12 2018 -0400 squash! Bug 26961: New user onboarding. Also fix bug 27403: the onboarding bubble is not always displayed. --- browser/extensions/onboarding/bootstrap.js | 6 +++++- browser/extensions/onboarding/content/onboarding.js | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/browser/extensions/onboarding/bootstrap.js b/browser/extensions/onboarding/bootstrap.js index 4bc6d468dce9..0762249ba1e9 100644 --- a/browser/extensions/onboarding/bootstrap.js +++ b/browser/extensions/onboarding/bootstrap.js @@ -14,7 +14,11 @@ XPCOMUtils.defineLazyModuleGetters(this, { const {PREF_STRING, PREF_BOOL, PREF_INT} = Ci.nsIPrefBranch; -const BROWSER_READY_NOTIFICATION = "browser-delayed-startup-finished"; +// In Tor Browser we initialize onboarding upon "final-ui-startup" instead +// of waiting for "browser-delayed-startup-finished"; otherwise, on first +// run the onboarding frame script's "onload" listener is installed too +// late to detect that about:tor is loaded. +const BROWSER_READY_NOTIFICATION = "final-ui-startup"; const BROWSER_SESSION_STORE_NOTIFICATION = "sessionstore-windows-restored"; const PREF_WHITELIST = [ ["browser.onboarding.enabled", PREF_BOOL], diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 1f46abdb722d..dd776b3edf93 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -642,7 +642,11 @@ class Onboarding { } _resizeUI() { - this._windowWidth = this._window.document.body.getBoundingClientRect().width; + // In Tor Browser we check against innerWidth instead of against the + // body's bounding rect because about:tor keeps its body hidden until + // the Tor status is known, and the bounding rect is zero while the + // body is hidden. + this._windowWidth = this._window.innerWidth; if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) { // Don't show the overlay UI before we get to a better, responsive design. this.destroy();

1 0

[tor-browser/tor-browser-60.2.0esr-8.0-1] fixup! Bug 26961: New user onboarding.
by gk＠torproject.org 01 Sep '18

01 Sep '18

commit 8b50d3f2f1bb5ce04ebf3a91ff701059fedb2da2 Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Sat Sep 1 12:00:35 2018 -0700 fixup! Bug 26961: New user onboarding. --- browser/extensions/onboarding/content/onboarding.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/extensions/onboarding/content/onboarding.js b/browser/extensions/onboarding/content/onboarding.js index 1f46abdb722d..4212e305a505 100644 --- a/browser/extensions/onboarding/content/onboarding.js +++ b/browser/extensions/onboarding/content/onboarding.js @@ -23,8 +23,8 @@ const BRAND_SHORT_NAME = Services.strings const PROMPT_COUNT_PREF = "browser.onboarding.notification.prompt-count"; const NOTIFICATION_FINISHED_PREF = "browser.onboarding.notification.finished"; const ONBOARDING_DIALOG_ID = "onboarding-overlay-dialog"; -const ONBOARDING_MIN_WIDTH_PX = 960; -const SPEECH_BUBBLE_MIN_WIDTH_PX = 960; +const ONBOARDING_MIN_WIDTH_PX = 200; +const SPEECH_BUBBLE_MIN_WIDTH_PX = 200; const SPEECH_BUBBLE_NEWTOUR_STRING_ID = "onboarding.overlay-icon-tooltip2"; const SPEECH_BUBBLE_UPDATETOUR_STRING_ID = "onboarding.overlay-icon-tooltip-updated2"; const ICON_STATE_WATERMARK = "watermark"; @@ -629,6 +629,7 @@ class Onboarding { tour_type: this._tourType, }); + this._resizeUI(); this._window.addEventListener("beforeunload", this); this._window.addEventListener("unload", this); this._window.addEventListener("resize", this); @@ -642,7 +643,7 @@ class Onboarding { } _resizeUI() { - this._windowWidth = this._window.document.body.getBoundingClientRect().width; + this._windowWidth = this._window.innerWidth; if (this._windowWidth < ONBOARDING_MIN_WIDTH_PX) { // Don't show the overlay UI before we get to a better, responsive design. this.destroy();

1 0

[torbutton/master] Bug 27401: Start listening for NoScript before it loads
by gk＠torproject.org 31 Aug '18

31 Aug '18

commit 9b79f00ade001b7da59ef0c8c6f560a62da954bb Author: Arthur Edelstein <arthuredelstein(a)gmail.com> Date: Fri Aug 31 15:00:33 2018 -0700 Bug 27401: Start listening for NoScript before it loads --- src/chrome/content/torbutton.js | 2 -- src/components/startup-observer.js | 4 ++++ src/modules/noscript-control.js | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 3f38830b..c3f68510 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -11,7 +11,6 @@ let { Services } = Cu.import("resource://gre/modules/Services.jsm", {}); let { showDialog, show_torbrowser_manual } = Cu.import("resource://torbutton/modules/utils.js", {}); let { unescapeTorString } = Cu.import("resource://torbutton/modules/utils.js", {}); let SecurityPrefs = Cu.import("resource://torbutton/modules/security-prefs.js", {}); -let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {}); let { bindPrefAndInit, observe } = Cu.import("resource://torbutton/modules/utils.js", {}); Cu.importGlobalProperties(["XMLHttpRequest"]); @@ -239,7 +238,6 @@ function torbutton_init() { torbutton_log(3, 'called init()'); SecurityPrefs.initialize(); - NoScriptControl.initialize(); if (m_tb_wasinited) { return; diff --git a/src/components/startup-observer.js b/src/components/startup-observer.js index cd9e7d2c..2d20a8ad 100644 --- a/src/components/startup-observer.js +++ b/src/components/startup-observer.js @@ -23,6 +23,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "FileUtils", "resource://gre/modules/FileUtils.jsm"); Cu.import("resource://torbutton/modules/default-prefs.js", {}).ensureDefaultPrefs(); +let NoScriptControl = Cu.import("resource://torbutton/modules/noscript-control.js", {}); // Module specific constants const kMODULE_NAME = "Startup"; @@ -154,6 +155,9 @@ StartupObserver.prototype = { // but only for hackish reasons. this._prefs.setBoolPref("extensions.torbutton.startup", true); + // We need to listen for NoScript before it starts. + NoScriptControl.initialize(); + this.setProxySettings(); } diff --git a/src/modules/noscript-control.js b/src/modules/noscript-control.js index 14f78c49..a03755de 100644 --- a/src/modules/noscript-control.js +++ b/src/modules/noscript-control.js @@ -126,12 +126,14 @@ var initialize = () => { // Wait for the first message from NoScript to arrive, and then // bind the security_slider pref to the NoScript settings. let messageListener = (a,b,c) => { + log(3, `Message received from NoScript: ${JSON.stringify([a,b,c])}`); extensionContext.api.browser.runtime.onMessage.removeListener(messageListener); bindPrefAndInit( "extensions.torbutton.security_slider", sliderState => setNoScriptSafetyLevel(securitySliderToSafetyLevel(sliderState))); }; extensionContext.api.browser.runtime.onMessage.addListener(messageListener); + log(3, "Listening for message from NoScript."); } catch (e) { log(5, e.message); }

1 0

[tor-browser-build/master] Use build3 for 8.0
by gk＠torproject.org 31 Aug '18

31 Aug '18

commit 7135298135febbbb9b008f37e0068868f8baf779 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 31 20:27:05 2018 +0000 Use build3 for 8.0 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index aef18c3..d694f1d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 7.5.6 project_name: tor-browser

1 0

[tor-browser-build/master] Actually ship stable win64 bundles
by gk＠torproject.org 31 Aug '18

31 Aug '18

commit e325ade8478ea7849ccbbd3c695592d5e5e87064 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 31 20:26:06 2018 +0000 Actually ship stable win64 bundles --- projects/release/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/release/config b/projects/release/config index 236325b..8605aa2 100644 --- a/projects/release/config +++ b/projects/release/config @@ -29,7 +29,7 @@ targets: torbrowser-windows-i686: 1 torbrowser-windows-x86_64: var: - torbrowser-windows-x86_64: '[% ! c("var/release") %]' + torbrowser-windows-x86_64: 1 torbrowser-osx-x86_64: var: torbrowser-osx-x86_64: 1

1 0

[tor-browser-build/master] Use build2 for 8.0
by gk＠torproject.org 31 Aug '18

31 Aug '18

commit 279d29d6078eb4776a9302c4a835078459006624 Author: Georg Koppen <gk(a)torproject.org> Date: Fri Aug 31 13:06:25 2018 +0000 Use build2 for 8.0 --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 824291f..aef18c3 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf: var: torbrowser_version: '8.0' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5.6 project_name: tor-browser

1 0

[tor-browser-build/master] Bug 27397: add arma's key C218525819F78451 to ./keyring/tor.gpg
by gk＠torproject.org 31 Aug '18

31 Aug '18

commit 4247dac61d501c2118a0a096fed453c04ba01ce8 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Aug 31 14:23:14 2018 +0200 Bug 27397: add arma's key C218525819F78451 to ./keyring/tor.gpg --- keyring/tor.gpg | Bin 21817 -> 159585 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/tor.gpg b/keyring/tor.gpg index 51eeb40..45b333f 100644 Binary files a/keyring/tor.gpg and b/keyring/tor.gpg differ

1 0