- tbb-commits - lists.torproject.org

[tor-browser-build/master] Bug 40302: Update version of snowflake
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 4faacf83a969c590db643bfcd67d6b4859770d57 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Tue Jun 1 15:03:50 2021 -0400 Bug 40302: Update version of snowflake --- projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/snowflake/config b/projects/snowflake/config index 95ef549..6022b2c 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' git_url: https://git.torproject.org/pluggable-transports/snowflake.git -git_hash: 1b29ad7de14fb0a6d2bf88aea38353733682cd26 +git_hash: ae7cc478fd345a1e588f8315ec980809c6806372 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' var:

1 0

[tor-browser-build/master] Merge remote-tracking branch 'cohoshgl/issue/40302'
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 318a0923b373728fcdf3b2db84b0b61e1ccd8176 Merge: 2d69c71 4faacf8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 16:07:51 2021 +0000 Merge remote-tracking branch 'cohoshgl/issue/40302' projects/snowflake/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit ccef7b35e20bd47dec7717bac2524b86878b2bd3 Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 24 15:22:36 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- .../torconnect/content/aboutTorConnect.css | 24 ++++++++++++++++++++++ .../torconnect/content/aboutTorConnect.js | 1 + browser/themes/shared/onionPattern.inc.xhtml | 7 +++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index eff767205266..a70904ca0b28 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -10,6 +10,30 @@ --onion-radius: 50px; } +/* override firefox's default blue focus coloring */ +:focus { + outline: none!important; + box-shadow: 0 0 0 3px #CD8CED !important; + border: 1px #59316B solid !important; +} + +@media (prefers-color-scheme: dark) +{ + :focus { + box-shadow: 0 0 0 3px #8C689E !important; + } +} + +/* override firefox's default blue border on hover */ +input[type="checkbox"]:not(:disabled):hover { + border-color: #59316B; +} + +/* fix checkbox visibility when dark mode enabled */ +input[type="checkbox"]:checked { + fill: var(--in-content-page-color); +} + #connectButton { background-color: #7D4698; } diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index a88a887c7878..5fb5b2924b94 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -278,6 +278,7 @@ class AboutTorConnect { this.elemConnectButton.addEventListener("click", () => { this.connect(); }); + this.elemConnectButton.focus(); this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; this.elemCancelButton.addEventListener("click", () => { diff --git a/browser/themes/shared/onionPattern.inc.xhtml b/browser/themes/shared/onionPattern.inc.xhtml index 95f073e673b4..6bbde93684a2 100644 --- a/browser/themes/shared/onionPattern.inc.xhtml +++ b/browser/themes/shared/onionPattern.inc.xhtml @@ -12,8 +12,11 @@ --> <div class="onion-pattern-container"> - <div class="onion-pattern-crop"> - <div class="onion-pattern-column"> +  + <div class="onion-pattern-crop" tabindex="-1"> + <div class="onion-pattern-column" tabindex="-1"> <div class="onion-pattern-row"> <div class="circle solid"></div>

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40480' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit f6578c3e0085fbb401e7fa3d3e5e323b80962c01 Merge: 9cb771f3026c ccef7b35e20b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 14:06:01 2021 +0000 Merge remote-tracking branch 'richardgl/40480' into tor-browser-78.11.0esr-10.5-1 .../torconnect/content/aboutTorConnect.css | 24 ++++++++++++++++++++++ .../torconnect/content/aboutTorConnect.js | 1 + browser/themes/shared/onionPattern.inc.xhtml | 7 +++++-- 3 files changed, 30 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] squash! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit 9cb771f3026c5303e2700e392826a9e028e9b2d5 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 20:17:21 2021 +0000 squash! Bug 28005: Implement .onion alias urlbar rewrites Bug 40456: Update the SecureDrop HTTPS-Everywhere update channel Bug 40478: Onion alias url rewrite is broken --- .../onionservices/HttpsEverywhereControl.jsm | 32 ++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index c91db3e8de87..d673de4cd6e5 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -10,7 +10,7 @@ const { ExtensionMessaging } = ChromeUtils.import( const { setTimeout } = ChromeUtils.import("resource://gre/modules/Timer.jsm"); const EXTENSION_ID = "https-everywhere-eff(a)eff.org"; -const SECUREDROP_TOR_ONION_CHANNEL = { +const SECUREDROP_TOR_ONION_CHANNEL_2020 = { name: "SecureDropTorOnion", jwk: { kty: "RSA", @@ -24,6 +24,20 @@ const SECUREDROP_TOR_ONION_CHANNEL = { replaces_default_rulesets: false, }; +const SECUREDROP_TOR_ONION_CHANNEL = { + name: "SecureDropTorOnion2021", + jwk: { + kty: "RSA", + e: "AQAB", + n: + "vsC7BNafkRe8Uh1DUgCkv6RbPQMdJgAKKnWdSqQd7tQzU1mXfmo_k1Py_2MYMZXOWmqSZ9iwIYkykZYywJ2VyMGve4byj1sLn6YQoOkG8g5Z3V4y0S2RpEfmYumNjTzfq8nxtLnwjaYd4sCUd5wa0SzeLrpRQuXo2bF3QuUF2xcbLJloxX1MmlsMMCdBc-qGNonLJ7bpn_JuyXlDWy1Fkeyw1qgjiOdiRIbMC1x302zgzX6dSrBrNB8Cpsh-vCE0ZjUo8M9caEv06F6QbYmdGJHM0ZZY34OHMSNdf-_qUKIV_SuxuSuFE99tkAeWnbWpyI1V-xhVo1sc7NzChP8ci2TdPvI3_0JyAuCvL6zIFqJUJkZibEUghhg6F09-oNJKpy7rhUJq7zZyLXJsvuXnn0gnIxfjRvMcDfZAKUVMZKRdw7fwWzwQril4Ib0MQOVda9vb_4JMk7Gup-TUI4sfuS4NKwsnKoODIO-2U5QpJWdtp1F4AQ1pBv8ajFl1WTrVGvkRGK0woPWaO6pWyJ4kRnhnxrV2FyNNt3JSR-0JEjhFWws47kjBvpr0VRiVRFppKA-plKs4LPlaaCff39TleYmY3mETe3w1GIGc2Lliad32Jpbx496IgDe1K3FMBEoKFZfhmtlRSXft8NKgSzPt2zkatM9bFKfaCYRaSy7akbk", + }, + update_path_prefix: "https://securedrop.org/https-everywhere-2021/", + scope: + "^https?:\\/\\/[a-z0-9-]+(?:\\.[a-z0-9-]+)*\\.securedrop\\.tor\\.onion\\/", + replaces_default_rulesets: false, +}; + class HttpsEverywhereControl { constructor() { this._extensionMessaging = null; @@ -56,6 +70,20 @@ class HttpsEverywhereControl { // for that here. await HttpsEverywhereControl.wait(); + try { + // Delete the previous channel signing key, and add the new one below. + await this._sendMessage( + "delete_update_channel", + SECUREDROP_TOR_ONION_CHANNEL_2020.name + ); + } catch (e) { + if (retries <= 0) { + throw new Error("Could not uninstall SecureDropTorOnion update channel"); + } + await this.installTorOnionUpdateChannel(retries - 1); + return; + } + try { // TODO: we may want a way to "lock" this update channel, so that it cannot be modified // by the user via UI, but I think this is not possible at the time of writing via @@ -89,7 +117,7 @@ class HttpsEverywhereControl { * Returns the timestamp of the last .tor.onion update channel update. */ async getRulesetTimestamp() { - const rulesets = await this._sendMessage("get_ruleset_timestamps"); + const rulesets = await this._sendMessage("get_update_channel_timestamps"); const securedrop = rulesets && rulesets.find(([{ name }]) => name === SECUREDROP_TOR_ONION_CHANNEL.name);

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit b61c939ceef2ed8e5cfa788f495a978883c02404 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 22 19:16:28 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/components/BrowserGlue.jsm | 19 ++++++++++++++++++- .../onionservices/HttpsEverywhereControl.jsm | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/browser/components/BrowserGlue.jsm b/browser/components/BrowserGlue.jsm index 2bd28ec1b04c..adc8e5edb07a 100644 --- a/browser/components/BrowserGlue.jsm +++ b/browser/components/BrowserGlue.jsm @@ -2506,7 +2506,24 @@ BrowserGlue.prototype = { { task: () => { - OnionAliasStore.init(); + if (Services.io.offline === false) { + // we will take this path when the user is using the legacy tor launcher + OnionAliasStore.init(); + } else { + // this path is taken when using about:torconnect, we start in offline mode + // and only switch to online after bootstrapping completes + const topic = "network:offline-status-changed"; + let offlineStatusChangedObserver = { + observe(aSubject, aTopic, aData) { + if (aTopic === topic && aData === "online") { + OnionAliasStore.init(); + // we only need to init once, so remove ourselves as an obvserver + Services.obs.removeObserver(this, topic); + } + } + }; + Services.obs.addObserver(offlineStatusChangedObserver, topic); + } }, }, diff --git a/browser/components/onionservices/HttpsEverywhereControl.jsm b/browser/components/onionservices/HttpsEverywhereControl.jsm index 60c3b5fca282..c91db3e8de87 100644 --- a/browser/components/onionservices/HttpsEverywhereControl.jsm +++ b/browser/components/onionservices/HttpsEverywhereControl.jsm @@ -27,6 +27,7 @@ const SECUREDROP_TOR_ONION_CHANNEL = { class HttpsEverywhereControl { constructor() { this._extensionMessaging = null; + this._init(); } async _sendMessage(type, object) { @@ -47,7 +48,6 @@ class HttpsEverywhereControl { * Installs the .tor.onion update channel in https-everywhere */ async installTorOnionUpdateChannel(retries = 5) { - this._init(); // TODO: https-everywhere store is initialized asynchronously, so sending a message // immediately results in a `store.get is undefined` error. @@ -115,5 +115,20 @@ class HttpsEverywhereControl { if (!this._extensionMessaging) { this._extensionMessaging = new ExtensionMessaging(); } + + // update all of the existing https-everywhere channels + setTimeout(async () => { + let pinnedChannels = await this._sendMessage("get_pinned_update_channels"); + for(let channel of pinnedChannels.update_channels) { + this._sendMessage("update_update_channel", channel); + } + + let storedChannels = await this._sendMessage("get_stored_update_channels"); + for(let channel of storedChannels.update_channels) { + this._sendMessage("update_update_channel", channel); + } + }, 0); + + } }

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40455' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 24 Jun '21

24 Jun '21

commit d03456f9cd90665c20f146437962d6e8138cc754 Merge: 8157aa761f34 b61c939ceef2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 24 00:41:34 2021 +0000 Merge remote-tracking branch 'richardgl/40455' into tor-browser-78.11.0esr-10.5-1 browser/components/BrowserGlue.jsm | 19 ++++++++++++++++++- .../onionservices/HttpsEverywhereControl.jsm | 17 ++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 40475: Include clearing CORS preflight cache
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 0f2ac709c04851627d75a7eb9ba32a4ecf7debf7 Author: Richard Pospesel <richard(a)torproject.org> Date: Tue Jun 22 15:37:00 2021 +0200 fixup! Bug 40475: Include clearing CORS preflight cache --- netwerk/protocol/http/nsCORSListenerProxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index d9b658af881b..6d2e160c2a9b 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -348,7 +348,9 @@ void nsCORSListenerProxy::Shutdown() { /* static */ void nsCORSListenerProxy::Clear() { - sPreflightCache->Clear(); + if (sPreflightCache) { + sPreflightCache->Clear(); + } } nsCORSListenerProxy::nsCORSListenerProxy(nsIStreamListener* aOuter,

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/40476' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 22 Jun '21

22 Jun '21

commit 8157aa761f342864c3c8b6109b24758ae7ead1ea Merge: 9c9884c27d5a 0f2ac709c048 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 22 14:58:49 2021 +0000 Merge remote-tracking branch 'richardgl/40476' into tor-browser-78.11.0esr-10.5-1 netwerk/protocol/http/nsCORSListenerProxy.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40311'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit b3629abd0fcd0a1b96c13e180031d3fe3f772260 Merge: 80e97dc dac2b35 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:53:26 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40311' projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmgl/bug_40313'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 2d69c715c1fdaa4099cf0d4bc37ba36c58d68f83 Merge: b3629ab 8ec1d47 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:57:18 2021 +0000 Merge remote-tracking branch 'boklmgl/bug_40313' rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor-browser-build/master] Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 8ec1d476c8a3b3e8a67a33964bb4e67f494efbf2 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 15:14:52 2021 +0200 Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies --- rbm.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index 6d2a774..9a9339f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -351,7 +351,7 @@ targets: wget $OPENJDK_URL/openjdk-8-jre-headless_$JDK_VERSION.deb echo 92b4f8fb77d793a86e0b03b3b0750592b40a26a5d75956d10dd984a7b3aad4c9 openjdk-8-jdk-headless_$JDK_VERSION.deb | sha256sum -c echo 84bf52b6cce20ead08b0d5b9fd9b81b4aa3da385ca951b313fe11d5cb1aa4d17 openjdk-8-jre-headless_$JDK_VERSION.deb | sha256sum -c - dpkg -i ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb + apt-get install -y -q ./openjdk-8-jre-headless_$JDK_VERSION.deb ./openjdk-8-jdk-headless_$JDK_VERSION.deb torbrowser-linux-x86_64: - linux-x86_64 - linux

1 0

[tor-browser-build/master] Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4)
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit dac2b35d64153c183165d0955b0e42f502798794 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Jun 18 12:14:26 2021 +0200 Bug 40311: Make the list of components updates for switch to mozilla90-based Fenix (beta 4) --- projects/android-components/config | 4 ++-- projects/application-services/config | 2 +- projects/application-services/list_toolchain_updates_checks | 4 ++-- projects/fenix/config | 4 ++-- projects/geckoview/config | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/projects/android-components/config b/projects/android-components/config index 0d8d88c..bf3b8a4 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -58,8 +58,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/android-components.git - #git_hash: v75.0.22 + git_url: https://github.com/mozilla-mobile/android-components.git + git_hash: v90.0.7 #tag_gpg_id: 0 var: container: diff --git a/projects/application-services/config b/projects/application-services/config index efbe321..93f8f5c 100644 --- a/projects/application-services/config +++ b/projects/application-services/config @@ -94,7 +94,7 @@ input_files: steps: list_toolchain_updates: - #git_hash: 'v74.0.1' + git_hash: 'v77.0.2' input_files: [] var: container: diff --git a/projects/application-services/list_toolchain_updates_checks b/projects/application-services/list_toolchain_updates_checks index 69c232c..b028d10 100644 --- a/projects/application-services/list_toolchain_updates_checks +++ b/projects/application-services/list_toolchain_updates_checks @@ -74,7 +74,7 @@ check_update_needed sqlcipher "$needed" "$current" # android-gradle-plugin read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_gradle_plugin_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_gradle_plugin_version\\s=\\s'([^']*)'/) { print $1; exit; } @@ -86,7 +86,7 @@ check_update_needed android-gradle-plugin "$needed" "$current" # android-components read -d '' p << 'EOF' || true -if (m/^\\s*ext\\.android_components_version\\s=\\s'([^']*)'/) { +if (m/^\\s*android_components_version\\s=\\s'([^']*)'/) { print $1; exit; } diff --git a/projects/fenix/config b/projects/fenix/config index a25aaa0..296ab7c 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -56,8 +56,8 @@ input_files: steps: list_toolchain_updates: - #git_url: https://github.com/mozilla-mobile/fenix.git - #git_hash: v89.1.1 + git_url: https://github.com/mozilla-mobile/fenix.git + git_hash: v90.0.0-beta.4 tag_gpg_id: 0 input_files: [] var: diff --git a/projects/geckoview/config b/projects/geckoview/config index 0695277..c46901e 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -138,9 +138,9 @@ steps: - torbrowser-android-x86_64 list_toolchain_updates: - #git_url: https://github.com/mozilla/gecko-dev.git - # 89.0b10 - #git_hash: 702dfbec3d62823d0dfca870995540383ab39183 + git_url: https://github.com/mozilla/gecko-dev.git + # 90.0b9 + git_hash: 92485800ccb404788bfd215e59c3850b314d3905 tag_gpg_id: 0 input_files: [] var:

1 0

[torbutton/master] Bug 40039: added min-height rule to Tor Circuit heading so onion icon is not cropped
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 0e79e26f682c87fbe26a42c021d9a4f72e2ae8aa Author: Richard Pospesel <richard(a)torproject.org> Date: Thu Jun 17 15:47:07 2021 +0200 Bug 40039: added min-height rule to Tor Circuit heading so onion icon is not cropped --- chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+) diff --git a/chrome/skin/tor-circuit-display.css b/chrome/skin/tor-circuit-display.css index 35c786ec..6f132db8 100644 --- a/chrome/skin/tor-circuit-display.css +++ b/chrome/skin/tor-circuit-display.css @@ -15,6 +15,7 @@ and lines drawn between them to represent Tor network inter-relay connections. background-repeat: no-repeat; background-position: 0 50%; background-size: 16px auto; + min-height: 16px; -moz-context-properties: fill, fill-opacity; fill: currentColor; /* icon indent + 16px icon width + 6px description margin

1 0

[torbutton/master] Merge remote-tracking branch 'richardgl/40039_rev'
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit d841a699f7048607230f7b15036f9a8c6a055527 Merge: cc73f75d 0e79e26f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 17 15:54:36 2021 +0000 Merge remote-tracking branch 'richardgl/40039_rev' chrome/skin/tor-circuit-display.css | 1 + 1 file changed, 1 insertion(+)

1 0

[tor-browser-build/master] Update/refresh torbrowser keyring
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 80e97dcd720810b66b2ce21d61c111e96541ffbc Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:40:39 2021 +0000 Update/refresh torbrowser keyring --- keyring/torbrowser.gpg | Bin 12262 -> 14048 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbrowser.gpg b/keyring/torbrowser.gpg index b23cae3..31c3596 100644 Binary files a/keyring/torbrowser.gpg and b/keyring/torbrowser.gpg differ

1 0

[tor-browser-build/master] Update/refresh torbutton keyring
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit f10b12c344a646b76238fd228f6799f249245b2b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 21:38:48 2021 +0000 Update/refresh torbutton keyring --- keyring/torbutton.gpg | Bin 140731 -> 144154 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/keyring/torbutton.gpg b/keyring/torbutton.gpg index a925b14..32e6d4c 100644 Binary files a/keyring/torbutton.gpg and b/keyring/torbutton.gpg differ

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Bug 40475: Include clearing CORS preflight cache
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 9c9884c27d5a1ee93dde9d78eda6df5707e816f8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Jun 6 20:32:23 2021 +0000 Bug 40475: Include clearing CORS preflight cache --- netwerk/protocol/http/nsCORSListenerProxy.cpp | 5 +++++ netwerk/protocol/http/nsCORSListenerProxy.h | 1 + netwerk/protocol/http/nsHttpHandler.cpp | 2 ++ 3 files changed, 8 insertions(+) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.cpp b/netwerk/protocol/http/nsCORSListenerProxy.cpp index 76870e6cea3f..d9b658af881b 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.cpp +++ b/netwerk/protocol/http/nsCORSListenerProxy.cpp @@ -346,6 +346,11 @@ void nsCORSListenerProxy::Shutdown() { sPreflightCache = nullptr; } +/* static */ +void nsCORSListenerProxy::Clear() { + sPreflightCache->Clear(); +} + nsCORSListenerProxy::nsCORSListenerProxy(nsIStreamListener* aOuter, nsIPrincipal* aRequestingPrincipal, bool aWithCredentials) diff --git a/netwerk/protocol/http/nsCORSListenerProxy.h b/netwerk/protocol/http/nsCORSListenerProxy.h index 8c0df2e0ff28..3f76be33f209 100644 --- a/netwerk/protocol/http/nsCORSListenerProxy.h +++ b/netwerk/protocol/http/nsCORSListenerProxy.h @@ -54,6 +54,7 @@ class nsCORSListenerProxy final : public nsIStreamListener, NS_DECL_NSITHREADRETARGETABLESTREAMLISTENER static void Shutdown(); + static void Clear(); [[nodiscard]] nsresult Init(nsIChannel* aChannel, DataURIHandling aAllowDataURI); diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index d5e2c61dbec9..c6cb95ca7fcc 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -10,6 +10,7 @@ #include "prsystem.h" #include "AltServiceChild.h" +#include "nsCORSListenerProxy.h" #include "nsError.h" #include "nsHttp.h" #include "nsHttpHandler.h" @@ -2290,6 +2291,7 @@ nsHttpHandler::Observe(nsISupports* subject, const char* topic, mAltSvcCache->ClearAltServiceMappings(); } } + nsCORSListenerProxy::Clear(); } else if (!strcmp(topic, NS_NETWORK_LINK_TOPIC)) { nsAutoCString converted = NS_ConvertUTF16toUTF8(data); if (!strcmp(converted.get(), NS_NETWORK_LINK_DATA_CHANGED)) {

1 0

[tor-browser-spec/master] fixup! Upgrade quickstart from Idea to Proposal
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 2b790522de5b25dda59b225a06754c749e8e4551 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 17:56:25 2021 +0000 fixup! Upgrade quickstart from Idea to Proposal --- proposals/106-quickstart.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/106-quickstart.txt b/proposals/106-quickstart.txt index 2fb5294..12da042 100644 --- a/proposals/106-quickstart.txt +++ b/proposals/106-quickstart.txt @@ -1,4 +1,4 @@ -Filename: xxx-quickstart.txt +Filename: 106-quickstart.txt Title: Tor Browser Quickstart Author: antonela Created: 09-Sep-2020

1 0

[tor-browser-spec/master] Upgrade quickstart from Idea to Proposal
by sysrqb＠torproject.org 21 Jun '21

21 Jun '21

commit 060b12824d03226e67472d29d7474001646de9db Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Jun 21 17:54:14 2021 +0000 Upgrade quickstart from Idea to Proposal --- proposals/{ideas/xxx-quickstart.txt => 106-quickstart.txt} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/ideas/xxx-quickstart.txt b/proposals/106-quickstart.txt similarity index 99% rename from proposals/ideas/xxx-quickstart.txt rename to proposals/106-quickstart.txt index 395b8c4..2fb5294 100644 --- a/proposals/ideas/xxx-quickstart.txt +++ b/proposals/106-quickstart.txt @@ -2,7 +2,7 @@ Filename: xxx-quickstart.txt Title: Tor Browser Quickstart Author: antonela Created: 09-Sep-2020 -Status: Draft +Status: Open Target: Tor Browser 10.5 1. Introduction

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] Merge remote-tracking branch 'richardgl/27476_fixup' into tor-browser-78.11.0esr-10.5-1
by sysrqb＠torproject.org 18 Jun '21

18 Jun '21

commit ca636f7fea97c6e05f226eee0c3b535d94fd261b Merge: 0ec919bf414f d27a43d5986f Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Jun 17 15:51:11 2021 +0000 Merge remote-tracking branch 'richardgl/27476_fixup' into tor-browser-78.11.0esr-10.5-1 browser/base/content/aboutNetError.js | 7 +- browser/components/torconnect/TorConnectParent.jsm | 11 +++ .../torconnect/content/aboutTorConnect.css | 73 ++++++++++------ .../torconnect/content/aboutTorConnect.js | 96 +++++++++++----------- .../torconnect/content/aboutTorConnect.xhtml | 13 +-- .../torconnect/content/torconnect-urlbar.css | 12 ++- .../components/torpreferences/content/torPane.js | 3 +- browser/components/urlbar/UrlbarInput.jsm | 31 +++++++ toolkit/modules/RemotePageAccessManager.jsm | 3 + toolkit/xre/nsAppRunner.cpp | 7 +- 10 files changed, 178 insertions(+), 78 deletions(-)

1 0

[tor-browser/tor-browser-78.11.0esr-10.5-1] fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
by sysrqb＠torproject.org 18 Jun '21

18 Jun '21

commit d27a43d5986ff72c28d1380a4622eab594395085 Author: Richard Pospesel <richard(a)torproject.org> Date: Fri Jun 11 15:46:34 2021 +0200 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser --- browser/base/content/aboutNetError.js | 7 +- browser/components/torconnect/TorConnectParent.jsm | 11 +++ .../torconnect/content/aboutTorConnect.css | 73 ++++++++++------ .../torconnect/content/aboutTorConnect.js | 96 +++++++++++----------- .../torconnect/content/aboutTorConnect.xhtml | 13 +-- .../torconnect/content/torconnect-urlbar.css | 12 ++- .../components/torpreferences/content/torPane.js | 3 +- browser/components/urlbar/UrlbarInput.jsm | 31 +++++++ toolkit/modules/RemotePageAccessManager.jsm | 3 + toolkit/xre/nsAppRunner.cpp | 7 +- 10 files changed, 178 insertions(+), 78 deletions(-) diff --git a/browser/base/content/aboutNetError.js b/browser/base/content/aboutNetError.js index 238b4930461c..b85ba74217cb 100644 --- a/browser/base/content/aboutNetError.js +++ b/browser/base/content/aboutNetError.js @@ -196,8 +196,13 @@ async function setErrorPageStrings(err) { async function initPage() { var err = getErrorCode(); + + // proxyConnectFailure because no-tor running daemon would return this error + // netOffline because we do not want to show the offline page (where users can disable offline-mode) + // when we are 'offline' (offline mode is disabled after successful bootstrapping in + // TorConnectParent) if ( - err === "proxyConnectFailure" && + (err === "proxyConnectFailure" || err === "netOffline") && (await RPMSendQuery("ShouldShowTorConnect")) ) { document.location.replace("about:torconnect"); diff --git a/browser/components/torconnect/TorConnectParent.jsm b/browser/components/torconnect/TorConnectParent.jsm index f775507a744f..cd574ada4da1 100644 --- a/browser/components/torconnect/TorConnectParent.jsm +++ b/browser/components/torconnect/TorConnectParent.jsm @@ -45,6 +45,17 @@ class TorConnectParent extends JSWindowActorParent { obj.handled = true; } self.sendAsyncMessage(aTopic, obj); + + // we need to tell the IOService that we are not online + // setting offline to false will make the io service send out + // 'network:offline-status-changed' message to observers + // the app updater (among other things) listens for this message + // and will attempt to check for updates when receiving this message + // to recover from a previously failed attempt + if (aTopic === kTorBootstrapStatusTopic && + obj.PROGRESS === 100) { + Services.io.offline = false; + } }, }; diff --git a/browser/components/torconnect/content/aboutTorConnect.css b/browser/components/torconnect/content/aboutTorConnect.css index 2081d4f6c4b8..eff767205266 100644 --- a/browser/components/torconnect/content/aboutTorConnect.css +++ b/browser/components/torconnect/content/aboutTorConnect.css @@ -43,42 +43,69 @@ position: relative; } -#copyLogTooltip { - visibility: hidden; - display: inline-block; - width: 100%; +/* mirrors p element spacing */ +#copyLogContainer { + margin: 1em 0; + height: 1.2em; + min-height: 1.2em; +} - position: absolute; - z-index: 1; - left: 0px; - bottom: calc(100% + 6px); +#copyLogLink { + position: relative; + display: inline-block; + color: var(--in-content-link-color); } -#copyLogTooltip::after { - content: ""; - position: absolute; - top: 100%; - left: 50%; - margin-left: -4px; - border-width: 4px; - border-style: solid; - border-color: #30E60B transparent transparent transparent; +/* hidden apparently only works if no display is set; who knew? */ +#copyLogLink[hidden="true"] { + display: none; } +#copyLogLink:hover { + cursor:pointer; +} + +/* This div: + - is centered over its parent + - centers its child + - has z-index above parent + - ignores mouse events from parent +*/ +#copyLogTooltip { + pointer-events: none; + visibility: hidden; + display: flex; + justify-content: center; + white-space: nowrap; + width: 0; + position: absolute; + + z-index: 1; + left: 50%; + bottom: calc(100% + 0.25em); +} +/* tooltip content (any content could go here) */ #copyLogTooltipText { - display: inline-block; background-color: #30E60B; color: #003706; border-radius: 2px; - text-align: center; + padding: 4px; line-height: 13px; - font: 11px Regular; + font: 11px sans-serif; font-weight: 400; +} - margin-left: auto; - margin-right: auto; - padding: 4px; +/* our speech bubble tail */ +#copyLogTooltipText::after { + content: ""; + position: absolute; + top: 100%; + left: 50%; + margin-left: -4px; + border-width: 4px; + border-style: solid; + border-color: #30E60B transparent transparent transparent; } body { diff --git a/browser/components/torconnect/content/aboutTorConnect.js b/browser/components/torconnect/content/aboutTorConnect.js index 5089bbc9363b..a88a887c7878 100644 --- a/browser/components/torconnect/content/aboutTorConnect.js +++ b/browser/components/torconnect/content/aboutTorConnect.js @@ -15,6 +15,10 @@ const TorLauncherPrefs = { prompt_at_startup: "extensions.torlauncher.prompt_at_startup", } +const BrowserPrefs = { + homepage: "browser.startup.homepage", +} + class AboutTorConnect { log(...args) { console.log(...args); @@ -40,6 +44,15 @@ class AboutTorConnect { get elemProgressMeter() { return this.getElem("progressBackground"); } + get elemCopyLogLink() { + return this.getElem("copyLogLink"); + } + get elemCopyLogTooltip() { + return this.getElem("copyLogTooltip"); + } + get elemCopyLogTooltipText() { + return this.getElem("copyLogTooltipText"); + } get elemQuickstartCheckbox() { return this.getElem("quickstartCheckbox"); } @@ -49,15 +62,6 @@ class AboutTorConnect { get elemConnectButton() { return this.getElem("connectButton"); } - get elemCopyLogButton() { - return this.getElem("copyLogButton"); - } - get elemCopyLogTooltip() { - return this.getElem("copyLogTooltip"); - } - get elemCopyLogTooltipText() { - return this.getElem("copyLogTooltipText"); - } get elemAdvancedButton() { return this.getElem("advancedButton"); } @@ -97,7 +101,7 @@ class AboutTorConnect { this.torStrings.settings.quickstartDescription; this.showElem(this.elemConnectButton); this.showElem(this.elemAdvancedButton); - this.hideElem(this.elemCopyLogButton); + this.hideElem(this.elemCopyLogLink); this.hideElem(this.elemCancelButton); this.hideElem(this.elemProgressContent); this.hideElem(this.elemProgressMeter); @@ -108,7 +112,7 @@ class AboutTorConnect { this.setTitle(this.torStrings.torConnect.torConnecting); this.hideElem(this.elemConnectButton); this.hideElem(this.elemAdvancedButton); - this.hideElem(this.elemCopyLogButton); + this.hideElem(this.elemCopyLogLink); this.showElem(this.elemCancelButton); this.showElem(this.elemProgressContent); this.showElem(this.elemProgressMeter); @@ -124,13 +128,14 @@ class AboutTorConnect { this.showElem(this.elemProgressContent); this.hideElem(this.elemProgressMeter); this.elemTitle.classList.add("error"); - - this.elem } goToBrowserHome() { this.hideElem(this.elemCancelButton); - RPMSendAsyncMessage("GoToBrowserHome"); + + // redirect this about:torconnect to browser homepage + const homepage = RPMGetStringPref(BrowserPrefs.homepage); + window.location.replace(homepage); } set state(state) { @@ -163,10 +168,7 @@ class AboutTorConnect { } } - let haveErrorOrWarning = - (await RPMSendQuery("TorBootstrapErrorOccurred")) || - (await RPMSendQuery("TorLogHasWarnOrErr")); - this.showCopyLogButton(haveErrorOrWarning); + this.showCopyLog(); this.showElem(this.elemConnectButton); } @@ -179,6 +181,11 @@ class AboutTorConnect { } async connect() { + // reset the text to original quickstart description + // in case we are trying again after an error (clears out error text) + this.elemProgressDesc.textContent = + this.torStrings.settings.quickstartDescription; + this.state = AboutTorConnect.STATE_BOOTSTRAPPING; const error = await RPMSendQuery("TorConnect"); if (error) { @@ -189,12 +196,8 @@ class AboutTorConnect { } } - restoreCopyLogVisibility() { - this.elemCopyLogButton.setAttribute("hidden", true); - } - - showCopyLogButton() { - this.elemCopyLogButton.removeAttribute("hidden"); + showCopyLog() { + this.elemCopyLogLink.removeAttribute("hidden"); } async updateBootstrapProgress(status) { @@ -241,28 +244,10 @@ class AboutTorConnect { RPMSendAsyncMessage("OpenTorAdvancedPreferences"); }); - this.elemQuickstartLabel.textContent = this.torStrings.settings.quickstartCheckbox; - this.elemQuickstartCheckbox.addEventListener("change", () => { - const quickstart = this.elemQuickstartCheckbox.checked; - RPMSetBoolPref(TorLauncherPrefs.quickstart, quickstart); - }); - this.elemQuickstartCheckbox.checked = await RPMGetBoolPref(TorLauncherPrefs.quickstart); - - this.elemConnectButton.textContent = - this.torStrings.torConnect.torConnectButton; - this.elemConnectButton.addEventListener("click", () => { - this.connect(); - }); - - this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; - this.elemCancelButton.addEventListener("click", () => { - this.stopTorBootstrap(); - }); - // sets the text content while keping the child elements intact - this.elemCopyLogButton.childNodes[0].nodeValue = + this.elemCopyLogLink.childNodes[0].nodeValue = this.torStrings.torConnect.copyLog; - this.elemCopyLogButton.addEventListener("click", async () => { + this.elemCopyLogLink.addEventListener("click", async (event) => { const copiedMessage = await RPMSendQuery("TorCopyLog"); aboutTorConnect.elemCopyLogTooltipText.textContent = copiedMessage; aboutTorConnect.elemCopyLogTooltip.style.visibility = "visible"; @@ -279,16 +264,35 @@ class AboutTorConnect { aboutTorConnect.copyLogTimeoutId = 0; }, TOOLTIP_TIMEOUT); }); + + + this.elemQuickstartLabel.textContent = this.torStrings.settings.quickstartCheckbox; + this.elemQuickstartCheckbox.addEventListener("change", () => { + const quickstart = this.elemQuickstartCheckbox.checked; + RPMSetBoolPref(TorLauncherPrefs.quickstart, quickstart); + }); + this.elemQuickstartCheckbox.checked = await RPMGetBoolPref(TorLauncherPrefs.quickstart); + + this.elemConnectButton.textContent = + this.torStrings.torConnect.torConnectButton; + this.elemConnectButton.addEventListener("click", () => { + this.connect(); + }); + + this.elemCancelButton.textContent = this.torStrings.torConnect.cancel; + this.elemCancelButton.addEventListener("click", () => { + this.stopTorBootstrap(); + }); } initObservers() { RPMAddMessageListener(kTorBootstrapErrorTopic, ({ data }) => { - this.showCopyLogButton(true); + this.showCopyLog(); this.stopTorBootstrap(); this.showErrorMessage(data); }); RPMAddMessageListener(kTorLogHasWarnOrErrTopic, () => { - this.showCopyLogButton(true); + this.showCopyLog(); }); RPMAddMessageListener(kTorProcessDidNotStartTopic, ({ data }) => { this.showErrorMessage(data); diff --git a/browser/components/torconnect/content/aboutTorConnect.xhtml b/browser/components/torconnect/content/aboutTorConnect.xhtml index d12c896c8959..0a0721afb7db 100644 --- a/browser/components/torconnect/content/aboutTorConnect.xhtml +++ b/browser/components/torconnect/content/aboutTorConnect.xhtml @@ -28,6 +28,14 @@ </div> </div> + <div id="copyLogContainer"> + <span id="copyLogLink" hidden="true"> + <div id="copyLogTooltip"> + <span id="copyLogTooltipText"/> + </div> + </span> + </div> + <div id="quickstartContainer"> <input id="quickstartCheckbox" type="checkbox" /> <label id="quickstartCheckboxLabel" for="quickstartCheckbox"/> @@ -35,11 +43,6 @@ <div id="connectButtonContainer" class="button-container"> <button id="advancedButton" hidden="true"></button> - <button id="copyLogButton" hidden="true"> - <div id="copyLogTooltip"> - <div id="copyLogTooltipText"></div> - </div> - </button> <button id="cancelButton" hidden="true"></button> <button id="connectButton" class="primary try-again" hidden="true"></button> </div> diff --git a/browser/components/torconnect/content/torconnect-urlbar.css b/browser/components/torconnect/content/torconnect-urlbar.css index 7331f3cd48df..db2f1069b22b 100644 --- a/browser/components/torconnect/content/torconnect-urlbar.css +++ b/browser/components/torconnect/content/torconnect-urlbar.css @@ -3,6 +3,7 @@ */ hbox.urlbar-page-action#torconnect-box { display: -moz-inline-box!important; + margin: 0 6px; height: 28px; } /* disable the button-like default css */ @@ -13,13 +14,14 @@ hbox.urlbar-page-action#torconnect-box:active { label#torconnect-label { line-height: 28px; - margin: 0 0.1em; + margin: 0; opacity: 0.6; } /* set appropriate sizes for the non-standard ui densities */ :root[uidensity=compact] { hbox.urlbar-page-action#torconnect-box { + margin: 0 4px; height: 24px; } label#torconnect-label { @@ -28,6 +30,7 @@ label#torconnect-label { } :root[uidensity=touch] { hbox.urlbar-page-action#torconnect-box { + margin: 0 7px; height: 30px; } label#torconnect-label { @@ -53,3 +56,10 @@ hbox#urlbar-input-container[torconnect="offline"] + vbox.urlbarView, hbox#urlbar-input-container[torconnect="connecting"] + vbox.urlbarView { display: none!important; } + +/* hide search icon when we are not connected to tor */ +hbox#urlbar-input-container[torconnect="offline"] > #identity-box[pageproxystate="invalid"] > #identity-icon, +hbox#urlbar-input-container[torconnect="connecting"] > #identity-box[pageproxystate="invalid"] > #identity-icon +{ + display: none!important; +} diff --git a/browser/components/torpreferences/content/torPane.js b/browser/components/torpreferences/content/torPane.js index 63db876a7ccd..d63b31c4c6f6 100644 --- a/browser/components/torpreferences/content/torPane.js +++ b/browser/components/torpreferences/content/torPane.js @@ -189,7 +189,8 @@ const gTorPane = (function() { this._messageBoxButton.addEventListener("click", () => { TorProtocolService.connect(); let win = Services.wm.getMostRecentWindow("navigator:browser"); - win.switchToTabHavingURI("about:torconnect"); + // switch to existing about:torconnect tab or create a new one + win.switchToTabHavingURI("about:torconnect", true); }); let populateMessagebox = () => { diff --git a/browser/components/urlbar/UrlbarInput.jsm b/browser/components/urlbar/UrlbarInput.jsm index 13b1279105f2..f727c386701c 100644 --- a/browser/components/urlbar/UrlbarInput.jsm +++ b/browser/components/urlbar/UrlbarInput.jsm @@ -10,6 +10,33 @@ const { XPCOMUtils } = ChromeUtils.import( "resource://gre/modules/XPCOMUtils.jsm" ); +const { TorProtocolService } = ChromeUtils.import( + "resource:///modules/TorProtocolService.jsm" +); + +// in certain scenarios we want user input uris to open in a new tab if they do so from the +// about:torconnect tab +function maybeUpdateOpenLocationForTorConnect(openUILinkWhere, currentURI, destinationURI) { + try { + // only open in new tab if: + if (// user is navigating away from about:torconnect + currentURI === "about:torconnect" && + // we are trying to open in same tab + openUILinkWhere === "current" && + // only if user still has not bootstrapped + TorProtocolService.shouldShowTorConnect() && + // and user is not just navigating to about:torconnect + destinationURI !== "about:torconnect") { + return "tab"; + } + } catch (e) { + // swallow exception and fall through returning original so we don't accidentally break + // anything if an exception is thrown + } + + return openUILinkWhere; +}; + XPCOMUtils.defineLazyModuleGetters(this, { AppConstants: "resource://gre/modules/AppConstants.jsm", BrowserUtils: "resource://gre/modules/BrowserUtils.jsm", @@ -1832,6 +1859,10 @@ class UrlbarInput { // area when the current tab is re-selected. browser.focus(); + openUILinkWhere = maybeUpdateOpenLocationForTorConnect( + openUILinkWhere, + this.window.gBrowser.currentURI.asciiSpec, + url); if (openUILinkWhere != "current") { this.handleRevert(); } diff --git a/toolkit/modules/RemotePageAccessManager.jsm b/toolkit/modules/RemotePageAccessManager.jsm index ee21aa7a750f..0c001e707096 100644 --- a/toolkit/modules/RemotePageAccessManager.jsm +++ b/toolkit/modules/RemotePageAccessManager.jsm @@ -205,6 +205,9 @@ let RemotePageAccessManager = { RPMSetBoolPref: [ "extensions.torlauncher.quickstart", ], + RPMGetStringPref: [ + "browser.startup.homepage", + ], }, }, diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp index 195b3637ca78..6c8105939fcb 100644 --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp @@ -2984,7 +2984,7 @@ bool fire_glxtest_process(); class XREMain { public: XREMain() - : mStartOffline(false), + : mStartOffline(true), mShuttingDown(false) #ifdef MOZ_HAS_REMOTE , @@ -3588,6 +3588,11 @@ int XREMain::XRE_mainInit(bool* aExitFlag) { CheckArg("new-instance"); #endif + // revert to start online behaviour when using the legacy tor launcher + if (EnvHasValue("TOR_USE_LEGACY_LAUNCHER")) { + mStartOffline = false; + } + ar = CheckArg("offline"); if (ar || EnvHasValue("XRE_START_OFFLINE")) { mStartOffline = true;

1 0

[Git][tpo/applications/android-components] Pushed new branch android-components-75.0.22-10.0-1
by Matthew Finkel (＠sysrqb) 17 Jun '21

17 Jun '21

Matthew Finkel pushed new branch android-components-75.0.22-10.0-1 at The Tor Project / Applications / android-components -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/android-components/-/tree/an… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new tag tor-browser-89.1.1-10.0-1-build1
by Matthew Finkel (＠sysrqb) 17 Jun '21

17 Jun '21

Matthew Finkel pushed new tag tor-browser-89.1.1-10.0-1-build1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-89.… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/fenix] Pushed new branch tor-browser-89.1.1-10.0-1
by Matthew Finkel (＠sysrqb) 17 Jun '21

17 Jun '21

Matthew Finkel pushed new branch tor-browser-89.1.1-10.0-1 at The Tor Project / Applications / fenix -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/fenix/-/tree/tor-browser-89.… You're receiving this email because of your account on gitlab.torproject.org.

1 0