[tor-browser] branch tor-browser-91.10.0esr-11.5-1 updated (b99f714220a4c -> 130fea073b7ba)
This is an automated email from the git hooks/post-receive script.
richard pushed a change to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
from b99f714220a4c fixup! Bug 40458: Implement .tor.onion aliases new e3fe5ce02a55d fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser new c2c361fb8e0d5 fixup! Add TorStrings module for localization new f124595ba4221 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new ea8ffe3c90673 fixup! Bug 10760: Integrate TorButton to TorBrowser core new 7244207afd1d1 fixup! Bug 2176: Rebrand Firefox to TorBrowser new e27326c6cb303 fixup! Bug 25658: Replace security slider with security level UI new c1c818b731dd2 fixup! Bug 21952: Implement Onion-Location new 130fea073b7ba fixup! Bug 10760: Integrate TorButton to TorBrowser core
The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
Summary of changes: browser/base/content/browser-menubar.inc | 2 +- browser/base/content/utilityOverlay.js | 3 +++ browser/components/about/AboutRedirector.cpp | 4 +++- browser/components/onionservices/OnionLocationParent.jsm | 3 ++- .../onionservices/content/onionlocationPreferences.js | 3 +++ browser/components/securitylevel/content/securityLevel.js | 6 ++++++ .../torpreferences/content/builtinBridgeDialog.jsm | 2 +- .../components/torpreferences/content/connectionPane.js | 14 +++++++++++++- .../torpreferences/content/provideBridgeDialog.jsm | 2 +- .../torpreferences/content/requestBridgeDialog.jsm | 2 +- browser/modules/TorStrings.jsm | 12 ++++++++---- toolkit/torproject/torbutton | 2 +- 12 files changed, 43 insertions(+), 12 deletions(-)
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit e3fe5ce02a55d412f52dc65bc5822ded78ef7c2b Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Jun 15 12:25:16 2022 +0200
fixup! Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
Fixed flags of about:manual. --- browser/components/about/AboutRedirector.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/browser/components/about/AboutRedirector.cpp b/browser/components/about/AboutRedirector.cpp index b46811eaadf74..0eb86297188c3 100644 --- a/browser/components/about/AboutRedirector.cpp +++ b/browser/components/about/AboutRedirector.cpp @@ -142,7 +142,9 @@ static const RedirEntry kRedirMap[] = { nsIAboutModule::URI_CAN_LOAD_IN_CHILD | nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::HIDE_FROM_ABOUTABOUT}, // The correct URI must be obtained by GetManualChromeURI - {"manual", "about:blank", nsIAboutModule::ALLOW_SCRIPT}, + {"manual", "about:blank", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT | nsIAboutModule::URI_MUST_LOAD_IN_CHILD | + nsIAboutModule::URI_CAN_LOAD_IN_PRIVILEGEDABOUT_PROCESS}, };
static nsAutoCString GetAboutModuleName(nsIURI* aURI) {
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit c2c361fb8e0d579b44a402da80c258da2b47066e Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Jun 14 11:43:26 2022 +0200
fixup! Add TorStrings module for localization
Updated Manual URLs --- browser/modules/TorStrings.jsm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/browser/modules/TorStrings.jsm b/browser/modules/TorStrings.jsm index 1586a3f787e39..84e959a1dcb1f 100644 --- a/browser/modules/TorStrings.jsm +++ b/browser/modules/TorStrings.jsm @@ -224,7 +224,7 @@ var TorStrings = { ), }, learnMore: getString("learn_more_label", "Learn more"), - learnMoreURL: `https://tb-manual.torproject.org/$%7BgetLocale()%7D/security-settings/%60, + learnMoreURL: 'about:manual#security-settings', restoreDefaults: getString("restore_defaults", "Restore Defaults"), advancedSecuritySettings: getString( "advanced_security_settings", @@ -461,8 +461,10 @@ var TorStrings = { ), copyLog: getString("torsettings.copyLog", "Copy Tor Log to Clipboard"),
- learnMoreTorBrowserURL: `https://tb-manual.torproject.org/$%7BgetLocale()%7D/about/%60, - learnMoreBridgesURL: `https://tb-manual.torproject.org/$%7BgetLocale()%7D/bridges/%60, + learnMoreTorBrowserURL: 'about:manual#about', + learnMoreBridgesURL: 'about:manual#bridges', + learnMoreBridgesCardURL: 'about:manual#bridges_bridge-moji', + learnMoreCircumventionURL: 'about:manual#circumvention', };
return retval; @@ -786,7 +788,9 @@ var TorStrings = { tryThis: getString("tryThis", "Try this: Onionsite"), onionAvailable: getString("onionAvailable", "Onionsite available"), learnMore: getString("learnMore", "Learn more"), - learnMoreURL: `https://tb-manual.torproject.org/$%7BgetLocale()%7D/onion-services/%60, + learnMoreURL: 'about:manual#onion-services', + // XUL popups cannot open about: URLs, but we are online when showing the notification, so just use the online version + learnMoreURLNotification: `https://tb-manual.torproject.org/$%7BgetLocale()%7D/onion-services/%60, always: getString("always", "Always"), askEverytime: getString("askEverytime", "Ask you every time"), prioritizeOnionsDescription: getString(
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit f124595ba4221bbd6030554a2199564e7be38f79 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Jun 14 11:42:18 2022 +0200
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
Update Manual URLs --- .../torpreferences/content/builtinBridgeDialog.jsm | 2 +- .../components/torpreferences/content/connectionPane.js | 14 +++++++++++++- .../torpreferences/content/provideBridgeDialog.jsm | 2 +- .../torpreferences/content/requestBridgeDialog.jsm | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/browser/components/torpreferences/content/builtinBridgeDialog.jsm b/browser/components/torpreferences/content/builtinBridgeDialog.jsm index c03e83178f26c..948ddb6b6de10 100644 --- a/browser/components/torpreferences/content/builtinBridgeDialog.jsm +++ b/browser/components/torpreferences/content/builtinBridgeDialog.jsm @@ -88,7 +88,7 @@ class BuiltinBridgeDialog { }); this._dialog.addEventListener("dialoghelp", e => { window.top.openTrustedLinkIn( - "https://tb-manual.torproject.org/circumvention/", + TorStrings.settings.learnMoreCircumventionURL, "tab" ); }); diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index 292123b0712c4..8d6d10fc83411 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -242,6 +242,9 @@ const gConnectionPane = (function() { "href", TorStrings.settings.learnMoreTorBrowserURL ); + if (TorStrings.settings.learnMoreTorBrowserURL.startsWith("about:")) { + learnMore.setAttribute("useoriginprincipal", "true"); + } }
// Internet and Tor status @@ -328,6 +331,9 @@ const gConnectionPane = (function() { let learnMore = prefpane.querySelector(selectors.bridges.learnMore); learnMore.setAttribute("value", TorStrings.settings.learnMore); learnMore.setAttribute("href", TorStrings.settings.learnMoreBridgesURL); + if (TorStrings.settings.learnMoreBridgesURL.startsWith("about:")) { + learnMore.setAttribute("useoriginprincipal", "true"); + } }
// Location @@ -440,7 +446,13 @@ const gConnectionPane = (function() { selectors.bridges.cardLearnMore ); learnMore.setAttribute("value", TorStrings.settings.learnMore); - learnMore.setAttribute("href", "about:blank"); + learnMore.setAttribute( + "href", + TorStrings.settings.learnMoreBridgesCardURL + ); + if (TorStrings.settings.learnMoreBridgesCardURL.startsWith("about:")) { + learnMore.setAttribute("useoriginprincipal", "true"); + } } bridgeTemplate.querySelector( selectors.bridges.cardConnectedLabel diff --git a/browser/components/torpreferences/content/provideBridgeDialog.jsm b/browser/components/torpreferences/content/provideBridgeDialog.jsm index 2e858bc338008..f20cf9ddd925d 100644 --- a/browser/components/torpreferences/content/provideBridgeDialog.jsm +++ b/browser/components/torpreferences/content/provideBridgeDialog.jsm @@ -47,7 +47,7 @@ class ProvideBridgeDialog { }); this._dialog.addEventListener("dialoghelp", e => { window.top.openTrustedLinkIn( - "https://tb-manual.torproject.org/bridges/", + TorStrings.settings.learnMoreBridgesURL, "tab" ); }); diff --git a/browser/components/torpreferences/content/requestBridgeDialog.jsm b/browser/components/torpreferences/content/requestBridgeDialog.jsm index f14bbdcbbb448..9b8cd6db0a9b9 100644 --- a/browser/components/torpreferences/content/requestBridgeDialog.jsm +++ b/browser/components/torpreferences/content/requestBridgeDialog.jsm @@ -68,7 +68,7 @@ class RequestBridgeDialog { }); this._dialog.addEventListener("dialoghelp", e => { window.top.openTrustedLinkIn( - "https://tb-manual.torproject.org/bridges/", + TorStrings.settings.learnMoreBridgesURL, "tab" ); });
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit ea8ffe3c906735a80775095b4780cdb6ce05d6c9 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Jun 14 11:44:09 2022 +0200
fixup! Bug 10760: Integrate TorButton to TorBrowser core
Updated Manual URLs --- browser/base/content/browser-menubar.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc index 4b7564cea0878..d3c272f8dc392 100644 --- a/browser/base/content/browser-menubar.inc +++ b/browser/base/content/browser-menubar.inc @@ -482,7 +482,7 @@ <box id="menu_HelpPopup_reportPhishingErrortoolmenu"/> <!-- Add Tor Browser manual link --> <menuitem id="torBrowserUserManual" - oncommand="gBrowser.selectedTab = gBrowser.addTab('https://tb-manual.torproject.org/' + Services.locale.requestedLocale, {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});" + oncommand="gBrowser.selectedTab = gBrowser.addTab('about:manual', {triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal()});" label="&aboutTor.torbrowser_user_manual.label;" accesskey="&aboutTor.torbrowser_user_manual.accesskey;"/> <!-- Bug 18905: Hide unused help menu items -->
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit 7244207afd1d149488aa88991c889031786f0ca0 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Jun 14 16:37:38 2022 +0200
fixup! Bug 2176: Rebrand Firefox to TorBrowser
Point Tor Browser Help to about:manual on the about dialog --- browser/base/content/utilityOverlay.js | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/browser/base/content/utilityOverlay.js b/browser/base/content/utilityOverlay.js index a95717544b80f..fd85693809036 100644 --- a/browser/base/content/utilityOverlay.js +++ b/browser/base/content/utilityOverlay.js @@ -1084,6 +1084,9 @@ function makeURLAbsolute(aBase, aUrl) { }
function getHelpLinkURL(aHelpTopic) { + if (aHelpTopic === "firefox-help" || aHelpTopic === "firefox-osxkey") { + return "about:manual"; + } var url = Services.urlFormatter.formatURLPref("app.support.baseURL"); return url + aHelpTopic; }
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit e27326c6cb303f32a5b7962fc202efcdf49e5c63 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Tue Jun 14 20:10:30 2022 +0200
fixup! Bug 25658: Replace security slider with security level UI
Make sure about:manual links can be opened --- browser/components/securitylevel/content/securityLevel.js | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/browser/components/securitylevel/content/securityLevel.js b/browser/components/securitylevel/content/securityLevel.js index 8b8babe5b58ef..95770dbc6bed9 100644 --- a/browser/components/securitylevel/content/securityLevel.js +++ b/browser/components/securitylevel/content/securityLevel.js @@ -230,6 +230,9 @@ const SecurityLevelPanel = { elements.customLabel.setAttribute("value", TorStrings.securityLevel.customWarning); elements.learnMoreLabel.setAttribute("value", TorStrings.securityLevel.learnMore); elements.learnMoreLabel.setAttribute("href", TorStrings.securityLevel.learnMoreURL); + if (TorStrings.securityLevel.learnMoreURL.startsWith("about:")) { + elements.learnMoreLabel.setAttribute("useoriginprincipal", "true"); + } elements.restoreDefaultsButton.setAttribute("label", TorStrings.securityLevel.restoreDefaults); elements.changeButton.setAttribute("label", TorStrings.securityLevel.change);
@@ -367,6 +370,9 @@ const SecurityLevelPreferences = let labelLearnMore = groupbox.querySelector("#securityLevel-learnMore"); labelLearnMore.setAttribute("value", TorStrings.securityLevel.learnMore); labelLearnMore.setAttribute("href", TorStrings.securityLevel.learnMoreURL); + if (TorStrings.securityLevel.learnMoreURL.startsWith("about:")) { + labelLearnMore.setAttribute("useoriginprincipal", "true"); + }
let radiogroup = document.getElementById("securityLevel-radiogroup"); radiogroup.addEventListener("command", SecurityLevelPreferences.selectSecurityLevel);
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit c1c818b731dd2c76aadcb0619568dd64505160f6 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Wed Jun 15 12:11:18 2022 +0200
fixup! Bug 21952: Implement Onion-Location
Updated the Manual URLs --- browser/components/onionservices/OnionLocationParent.jsm | 3 ++- browser/components/onionservices/content/onionlocationPreferences.js | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/browser/components/onionservices/OnionLocationParent.jsm b/browser/components/onionservices/OnionLocationParent.jsm index f6250e5548625..4ac4a5d0775ea 100644 --- a/browser/components/onionservices/OnionLocationParent.jsm +++ b/browser/components/onionservices/OnionLocationParent.jsm @@ -29,7 +29,8 @@ const NOTIFICATION_OK_ACCESSKEY = TorStrings.onionLocation.alwaysPrioritizeAccessKey; const NOTIFICATION_TITLE = TorStrings.onionLocation.tryThis; const NOTIFICATION_DESCRIPTION = TorStrings.onionLocation.description; -const NOTIFICATION_LEARN_MORE_URL = TorStrings.onionLocation.learnMoreURL; +const NOTIFICATION_LEARN_MORE_URL = + TorStrings.onionLocation.learnMoreURLNotification;
class OnionLocationParent extends JSWindowActorParent { // Listeners are added in BrowserGlue.jsm diff --git a/browser/components/onionservices/content/onionlocationPreferences.js b/browser/components/onionservices/content/onionlocationPreferences.js index aa569b54721cd..005e37d4a9915 100644 --- a/browser/components/onionservices/content/onionlocationPreferences.js +++ b/browser/components/onionservices/content/onionlocationPreferences.js @@ -17,6 +17,9 @@ const OnionLocationPreferences = { const learnMore = document.getElementById("onionServicesLearnMore"); learnMore.textContent = TorStrings.onionLocation.learnMore; learnMore.href = TorStrings.onionLocation.learnMoreURL; + if (TorStrings.onionLocation.learnMoreURL.startsWith("about:")) { + learnMore.setAttribute("useoriginprincipal", "true"); + } document.getElementById("onionServicesRadioAlways").label = TorStrings.onionLocation.always; document.getElementById("onionServicesRadioAsk").label =
This is an automated email from the git hooks/post-receive script.
richard pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser.
commit 130fea073b7ba0640a6531a1496870fae391cc7f Author: Richard Pospesel richard@torproject.org AuthorDate: Fri Jun 17 17:35:14 2022 +0000
fixup! Bug 10760: Integrate TorButton to TorBrowser core --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index f1df5ea1890d3..8f25518a68e7a 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit f1df5ea1890d35be7d557bf227028fce0eb1a8da +Subproject commit 8f25518a68e7a8671ca2b8e7ce11eeaf4d3b45af
tbb-commits@lists.torproject.org
-
gitolite role