- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40707: Don't redirect 11.5.8 users to pre12.0
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 926c375c by Nicolas Vigier at 2022-12-15T18:48:34+00:00 Bug 40707: Don't redirect 11.5.8 users to pre12.0 - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -64,6 +64,9 @@ htaccess_rewrite_rules: release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] - # tor-browser-build#40678: Force all 11.5 users to update through 11.5.8 before 12.0 + # tor-browser-build#40678: Force all <=11.5.7 users to update through 11.5.8 before 12.0 RewriteRule ^[^/]+/[89]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] - RewriteRule ^[^/]+/1[01]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/10\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5\.[01234567]/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] 2 commits: fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 683baff6 by Pier Angelo Vendrame at 2022-12-15T15:01:28+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41001: Removed the old security preferences code from torbutton. - - - - - c7a1ca3c by Pier Angelo Vendrame at 2022-12-15T15:01:28+00:00 fixup! Add TorStrings module for localization Bug 41001: Removed strings used only by preferences.xhtml - - - - - 5 changed files: - − toolkit/torbutton/chrome/content/preferences-mobile.js - − toolkit/torbutton/chrome/content/preferences.xhtml - toolkit/torbutton/chrome/content/torbutton.js - toolkit/torbutton/chrome/locale/en-US/torbutton.dtd - toolkit/torbutton/jar.mn Changes: ===================================== toolkit/torbutton/chrome/content/preferences-mobile.js deleted ===================================== @@ -1,59 +0,0 @@ -// # Security Settings User Interface for Mobile - -// Utilities -const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); -const { - getBoolPref, - getIntPref, - setBoolPref, - setIntPref, - getCharPref, -} = Services.prefs; - -// Description elements have the follow names. -const descNames = ["", "desc_standard", "desc_safer", "desc_safest"]; -// "Learn-more"-elements have the follow names. -const linkNames = ["", "link_standard", "link_safer", "link_safest"]; -// A single `state` object that reflects the user settings in this UI. - -let state = { slider: 0, custom: false }; - -// Utility functions to convert between the legacy 4-value pref index -// and the 3-valued security slider. -let sliderPositionToPrefSetting = pos => [0, 4, 2, 1][pos]; -let prefSettingToSliderPosition = pref => [0, 3, 2, 2, 1][pref]; - -// Set the desired slider value and update UI. -function torbutton_set_slider(sliderValue) { - state.slider = sliderValue; - let slider = document.getElementById("torbutton_sec_slider"); - slider.value = sliderValue.toString(); - let descs = descNames.map(name => document.getElementById(name)); - descs.forEach((desc, i) => { - if (state.slider !== i) { - desc.style.display = "none"; - } else { - desc.style.display = "block"; - } - }); - torbutton_save_security_settings(); -} - -// Read prefs 'browser.security_level.security_slider' and -// 'browser.security_level.security_custom', and initialize the UI. -function torbutton_init_security_ui() { - torbutton_set_slider( - prefSettingToSliderPosition( - getIntPref("browser.security_level.security_slider") - ) - ); -} - -// Write the two prefs from the current settings. -function torbutton_save_security_settings() { - setIntPref( - "browser.security_level.security_slider", - sliderPositionToPrefSetting(state.slider) - ); - setBoolPref("browser.security_level.security_custom", state.custom); -} ===================================== toolkit/torbutton/chrome/content/preferences.xhtml deleted ===================================== @@ -1,84 +0,0 @@ -<!DOCTYPE overlay SYSTEM "chrome://torbutton/locale/torbutton.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> - <meta charset="UTF-8"/> - <meta name="viewport" content="width=device-width, initial-scale=1"/> - <head> - <title>&torbutton.prefs.security_settings;</title> - <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences.css"/> - <link type="text/css" rel="stylesheet" charset="UTF-8" href="chrome://torbutton/skin/preferences-mobile.css"/> - <script type="text/javascript" src="preferences-mobile.js"></script> - <style> - </style> - </head> - <body onload="torbutton_init_security_ui()"> - <div class="wrapper outer-wrapper"> - <div class="title"> - &torbutton.prefs.sec_caption; - </div> - <div class="wrapper inner-wrapper"> - <input id="torbutton_sec_slider" type="range" min="1" max="3" list="datalist" onchange="torbutton_set_slider(parseInt(this.value, 10))"/> - <datalist id="datalist"> - <option onclick="torbutton_set_slider(1)"> - &torbutton.prefs.sec_standard_label; - </option> - <option onclick="torbutton_set_slider(2)"> - &torbutton.prefs.sec_safer_label; - </option> - <option onclick="torbutton_set_slider(3)"> - &torbutton.prefs.sec_safest_label; - </option> - </datalist> - <div class="description-wrapper"> - <div id="desc_safest" class="description"> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safest_description; - </p> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safest_list_label; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_js_disabled; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_limit_graphics_and_typography; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_click_to_play_media; - </p> - <a id="link_safest" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </a> - </div> - <div id="desc_safer" class="description"> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safer_description; - </p> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_safer_list_label; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_js_on_https_sites_only; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_limit_typography; - </p> - <p class="slider-text-size"> - &torbutton.prefs.sec_click_to_play_media; - </p> - <a id="link_safer" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </a> - </div> - <div id="desc_standard" class="description"> - <p class="slider-text-size slider-text-weight"> - &torbutton.prefs.sec_standard_description; - </p> - <a id="link_standard" class="text-link"> - &torbutton.prefs.sec_learn_more_label; - </a> - </div> - </div> - </div> - </div> - </body> -</html> ===================================== toolkit/torbutton/chrome/content/torbutton.js ===================================== @@ -20,7 +20,6 @@ var torbutton_new_circuit; let { unescapeTorString, - bindPrefAndInit, getDomainForBrowser, torbutton_log, torbutton_get_property_string, @@ -185,10 +184,6 @@ var torbutton_new_circuit; }, }; - function torbutton_is_mobile() { - return Services.appinfo.OS === "Android"; - } - // Bug 1506 P2-P4: This code sets some version variables that are irrelevant. // It does read out some important environment variables, though. It is // called once per browser window.. This might belong in a component. @@ -269,8 +264,6 @@ var torbutton_new_circuit; torbutton_abouttor_message_handler ); - setupPreferencesForMobile(); - torbutton_log(1, "registering Tor check observer"); torbutton_tor_check_observer.register(); @@ -323,7 +316,7 @@ var torbutton_new_circuit; // not working. async getChromeData(aIsRespondingToPageLoad) { let dataObj = { - mobile: torbutton_is_mobile(), + mobile: Services.appinfo.OS === "Android", updateChannel: AppConstants.MOZ_UPDATE_CHANNEL, torOn: await torbutton_tor_check_ok(), }; @@ -788,53 +781,6 @@ var torbutton_new_circuit; return true; } - function showSecurityPreferencesPanel(chromeWindow) { - const tabBrowser = chromeWindow.BrowserApp; - let settingsTab = null; - - const SECURITY_PREFERENCES_URI = - "chrome://torbutton/content/preferences.xhtml"; - - tabBrowser.tabs.some(function(tab) { - // If the security prefs tab is opened, send the user to it - if (tab.browser.currentURI.spec === SECURITY_PREFERENCES_URI) { - settingsTab = tab; - return true; - } - return false; - }); - - if (settingsTab === null) { - // Open up the settings panel in a new tab. - tabBrowser.addTab(SECURITY_PREFERENCES_URI, { - selected: true, - parentId: tabBrowser.selectedTab.id, - triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(), - }); - } else { - // Activate an existing settings panel tab. - tabBrowser.selectTab(settingsTab); - } - } - - function setupPreferencesForMobile() { - if (!torbutton_is_mobile()) { - return; - } - - torbutton_log(4, "Setting up settings preferences for Android."); - - const chromeWindow = Services.wm.getMostRecentWindow("navigator:browser"); - - // Add the extension's chrome menu item to the main browser menu. - chromeWindow.NativeWindow.menu.add({ - name: torbutton_get_property_string( - "torbutton.security_settings.menu.title" - ), - callback: showSecurityPreferencesPanel.bind(this, chromeWindow), - }); - } - // Bug 1506 P3: This is needed pretty much only for the window resizing. // See comments for individual functions for details function torbutton_new_window(event) { ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.dtd ===================================== @@ -13,30 +13,3 @@  <!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> <!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> - -<!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.prefs.sec_caption "Security Level"> -<!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> -<!ENTITY torbutton.prefs.sec_standard_label "Standard"> -<!ENTITY torbutton.prefs.sec_standard_description "All Tor Browser and website features are enabled."> -<!ENTITY torbutton.prefs.sec_safer_label "Safer"> -<!ENTITY torbutton.prefs.sec_safer_description "Disables website features that are often dangerous, causing some sites to lose functionality."> -<!ENTITY torbutton.prefs.sec_safer_list_label "At the safer setting:"> -<!ENTITY torbutton.prefs.sec_safest_label "Safest"> -<!ENTITY torbutton.prefs.sec_safest_description "Only allows website features required for static sites and basic services. These changes affect images, media, and scripts."> -<!ENTITY torbutton.prefs.sec_safest_list_label "At the safest setting:"> -<!ENTITY torbutton.prefs.sec_learn_more_label "Learn more"> -<!ENTITY torbutton.prefs.sec_js_on_https_sites_only "JavaScript is disabled on non-HTTPS sites."> -<!ENTITY torbutton.prefs.sec_js_disabled "JavaScript is disabled by default on all sites."> -<!ENTITY torbutton.prefs.sec_limit_typography "Some fonts and math symbols are disabled."> -<!ENTITY torbutton.prefs.sec_limit_graphics_and_typography "Some fonts, icons, math symbols, and images are disabled."> -<!ENTITY torbutton.prefs.sec_click_to_play_media "Audio and video (HTML5 media), and WebGL are click-to-play."> -<!ENTITY torbutton.prefs.sec_custom_warning "Custom"> -<!ENTITY torbutton.prefs.sec_overview "Disable certain web features that can be used to attack your security and anonymity."> -<!ENTITY torbutton.prefs.sec_standard_tooltip "Security Level : Standard"> -<!ENTITY torbutton.prefs.sec_safer_tooltip "Security Level : Safer"> -<!ENTITY torbutton.prefs.sec_safest_tooltip "Security Level : Safest"> -<!ENTITY torbutton.prefs.sec_custom_summary "Your custom browser preferences have resulted in unusual security settings. For security and privacy reasons, we recommend you choose one of the default security levels."> -<!ENTITY torbutton.prefs.sec_restore_defaults "Restore Defaults"> -<!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> -<!ENTITY torbutton.prefs.sec_change "Change…"> ===================================== toolkit/torbutton/jar.mn ===================================== @@ -6,11 +6,9 @@ torbutton.jar: content/torbutton.js (chrome/content/torbutton.js) content/tor-circuit-display.js (chrome/content/tor-circuit-display.js) - content/preferences.xhtml (chrome/content/preferences.xhtml) content/aboutTor/aboutTor-content.js (chrome/content/aboutTor/aboutTor-content.js) * content/aboutTor/aboutTor.xhtml (chrome/content/aboutTor/aboutTor.xhtml) content/aboutTor/resources/aboutTor.js (chrome/content/aboutTor/resources/aboutTor.js) - content/preferences-mobile.js (chrome/content/preferences-mobile.js) components/ (components/*) modules/ (modules/*) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/81c511… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/81c511… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] fixup! Bug 16940: After update, load local change notes.
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 81c5119b by Pier Angelo Vendrame at 2022-12-13T16:27:53+01:00 fixup! Bug 16940: After update, load local change notes. Bug 41524: Read changelogs as UTF-8 - - - - - 1 changed file: - browser/actors/AboutTBUpdateParent.jsm Changes: ===================================== browser/actors/AboutTBUpdateParent.jsm ===================================== @@ -22,9 +22,9 @@ const kRequestUpdateMessageName = "FetchUpdateData"; * implementation. */ class AboutTBUpdateParent extends JSWindowActorParent { - receiveMessage(aMessage) { + async receiveMessage(aMessage) { if (aMessage.name == kRequestUpdateMessageName) { - return this.releaseNoteInfo; + return this.getReleaseNoteInfo(); } return undefined; } @@ -51,7 +51,7 @@ class AboutTBUpdateParent extends JSWindowActorParent { // On Mac OS, when building with --enable-tor-browser-data-outside-app-dir // to support Gatekeeper signing, the ChangeLog.txt file is located in // TorBrowser.app/Contents/Resources/TorBrowser/Docs/. - get releaseNoteInfo() { + async getReleaseNoteInfo() { let info = { moreInfoURL: this.moreInfoURL }; try { @@ -74,12 +74,7 @@ class AboutTBUpdateParent extends JSWindowActorParent { f.append("Docs"); f.append("ChangeLog.txt"); - let fs = Cc["@mozilla.org/network/file-input-stream;1"].createInstance( - Ci.nsIFileInputStream - ); - fs.init(f, -1, 0, 0); - let s = NetUtil.readInputStreamToString(fs, fs.available()); - fs.close(); + let s = await IOUtils.readUTF8(f.path); // Truncate at the first empty line. s = s.replace(/[\r\n][\r\n][\s\S]*$/m, ""); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81c5119… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81c5119… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch base-browser-102.6.0esr-12.5-1
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed new branch base-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-102.6.0esr-12.5-1
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed new branch tor-browser-102.6.0esr-12.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40707: Don't redirect 11.5.8 users to pre12.0
by Richard Pospesel (＠richard) 15 Dec '22

15 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: ea4c8aa3 by Nicolas Vigier at 2022-12-13T20:07:12+01:00 Bug 40707: Don't redirect 11.5.8 users to pre12.0 - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -64,6 +64,9 @@ htaccess_rewrite_rules: release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] - # tor-browser-build#40678: Force all 11.5 users to update through 11.5.8 before 12.0 + # tor-browser-build#40678: Force all <=11.5.7 users to update through 11.5.8 before 12.0 RewriteRule ^[^/]+/[89]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] - RewriteRule ^[^/]+/1[01]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/10\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/11\.5\.[01234567]/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Deleted branch foo
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel deleted branch foo at The Tor Project / Applications / Tor Browser -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch foo
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed new branch foo at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/foo You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Deleted branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash
by Pier Angelo Vendrame (＠pierov) 14 Dec '22

14 Dec '22

Pier Angelo Vendrame deleted branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash at The Tor Project / Applications / Tor Browser -- You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash
by Pier Angelo Vendrame (＠pierov) 14 Dec '22

14 Dec '22

Pier Angelo Vendrame pushed new branch 41503-disable-restart-in-case-of-reboot-and-restore-in-case-of-crash at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/41503-dis… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.6.0esr-12.0-1-build2
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed new tag tor-browser-102.6.0esr-12.0-1-build2 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 2 commits: Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 8825bcad by hackademix at 2022-12-14T13:34:31+00:00 Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore - - - - - 8b01895e by hackademix at 2022-12-14T13:34:31+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core - - - - - 5 changed files: - browser/components/places/PlacesUIUtils.jsm - browser/components/places/content/controller.js - dom/base/ContentAreaDropListener.jsm - toolkit/components/places/PlacesUtils.jsm - toolkit/torproject/torbutton Changes: ===================================== browser/components/places/PlacesUIUtils.jsm ===================================== @@ -1903,7 +1903,11 @@ XPCOMUtils.defineLazyGetter(PlacesUIUtils, "URI_FLAVORS", () => { return [PlacesUtils.TYPE_X_MOZ_URL, TAB_DROP_TYPE, PlacesUtils.TYPE_UNICODE]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "SUPPORTED_FLAVORS", () => { - return [...PlacesUIUtils.PLACES_FLAVORS, ...PlacesUIUtils.URI_FLAVORS]; + return [ + ...PlacesUIUtils.PLACES_FLAVORS, + ...PlacesUIUtils.URI_FLAVORS, + "application/x-torbrowser-opaque", + ]; }); XPCOMUtils.defineLazyGetter(PlacesUIUtils, "ellipsis", function() { ===================================== browser/components/places/content/controller.js ===================================== @@ -1251,6 +1251,7 @@ PlacesController.prototype = { [ PlacesUtils.TYPE_X_MOZ_PLACE, PlacesUtils.TYPE_X_MOZ_URL, + "application/x-torbrowser-opaque", PlacesUtils.TYPE_UNICODE, ].forEach(type => xferable.addDataFlavor(type)); ===================================== dom/base/ContentAreaDropListener.jsm ===================================== @@ -5,6 +5,16 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm"); +const { XPCOMUtils } = ChromeUtils.import( + "resource://gre/modules/XPCOMUtils.jsm" +); + +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // This component is used for handling dragover and drop of urls. // // It checks to see whether a drop of a url is allowed. For instance, a url @@ -43,10 +53,15 @@ ContentAreaDropListener.prototype = { } } - type = "text/x-moz-url"; - if (types.contains(type)) { + for (let type of ["text/x-moz-url", "application/x-torbrowser-opaque"]) { + if (!types.contains(type)) { + continue; + } data = dt.mozGetDataAt(type, i); if (data) { + if (type === "application/x-torbrowser-opaque") { + ({ type, value: data = "" } = gOpaqueDrag.get(data)); + } let lines = data.split("\n"); for (let i = 0, length = lines.length; i < length; i += 2) { this._addLink(links, lines[i], lines[i + 1], type); @@ -250,6 +265,7 @@ ContentAreaDropListener.prototype = { if ( !types.includes("application/x-moz-file") && !types.includes("text/x-moz-url") && + !types.includes("application/x-torbrowser-opaque") && !types.includes("text/uri-list") && !types.includes("text/x-moz-text-internal") && !types.includes("text/plain") ===================================== toolkit/components/places/PlacesUtils.jsm ===================================== @@ -32,6 +32,12 @@ XPCOMUtils.defineLazyGetter(this, "gCryptoHash", () => { return Cc["@mozilla.org/security/hash;1"].createInstance(Ci.nsICryptoHash); }); +XPCOMUtils.defineLazyGetter(this, "gOpaqueDrag", () => { + return Cc["@torproject.org/torbutton-dragDropFilter;1"].getService( + Ci.nsISupports + ).wrappedJSObject.opaqueDrag; +}); + // On Mac OSX, the transferable system converts "\r\n" to "\n\n", where // we really just want "\n". On other platforms, the transferable system // converts "\r\n" to "\n". @@ -1132,6 +1138,9 @@ var PlacesUtils = { unwrapNodes: function PU_unwrapNodes(blob, type) { // We split on "\n" because the transferable system converts "\r\n" to "\n" var nodes = []; + if (type === "application/x-torbrowser-opaque") { + ({ value: blob, type } = gOpaqueDrag.get(blob)); + } switch (type) { case this.TYPE_X_MOZ_PLACE: case this.TYPE_X_MOZ_PLACE_SEPARATOR: ===================================== toolkit/torproject/torbutton ===================================== @@ -1 +1 @@ -Subproject commit b0a2e740d6c7440cc9722358eb775c6a04f49e72 +Subproject commit a5767f29c0d509c6cb34527c091ae0c4bfc2f386 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2657bb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2657bb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: 2657bbcf by Richard Pospesel at 2022-12-14T13:20:10+00:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core migrate from gitolite repo to our gitlab repo for the torbutton submodule - - - - - 1 changed file: - .gitmodules Changes: ===================================== .gitmodules ===================================== @@ -1,3 +1,3 @@ [submodule "toolkit/torproject/torbutton"] path = toolkit/torproject/torbutton - url = https://git.torproject.org/torbutton.git + url = https://gitlab.torproject.org/tpo/applications/torbutton.git View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2657bbc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2657bbc… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/torbutton][maint-12.0] Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore
by Richard Pospesel (＠richard) 14 Dec '22

14 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / torbutton Commits: a5767f29 by hackademix at 2022-12-14T12:43:47+00:00 Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore - - - - - 1 changed file: - components/dragDropFilter.js Changes: ===================================== components/dragDropFilter.js ===================================== @@ -13,6 +13,7 @@ const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); XPCOMUtils.defineLazyModuleGetters(this, { ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", }); +XPCOMUtils.defineLazyGlobalGetters(this, ["crypto"]); // Module specific constants const kMODULE_NAME = "Torbutton Drag and Drop Handler"; @@ -28,50 +29,55 @@ const URLISH_TYPES = Object.freeze([ "application/x-moz-file-promise-url", ]); -/* - Returns true if the text resembles a URL or even just a hostname - in a way that may prompt the O.S. or other applications to send out a - validation DNS query, if not a full request (e.g. " torproject.org", - even with the leading whitespace). -*/ -function isURLish(text) { - // Ignore leading whitespace. - text = text.trim(); - - // Without any protocol or dot in the first chunk, this is unlikely - // to be considered URLish (exception: localhost, but we don't care). - if (!/^[a-z][a-z0-9+-]*:\/\//i.test(text)) { - // no protocol - if (!/^[^.\s\/]+\.[^.\s\/]/.test(text)) { - // no dot - return false; +const MAIN_PROCESS = + Services.appinfo.processType === Services.appinfo.PROCESS_TYPE_DEFAULT; + +const EMPTY_PAYLOAD = {}; +const OpaqueDrag = { + listening: false, + payload: EMPTY_PAYLOAD, + store(value, type) { + let opaqueKey = crypto.randomUUID(); + this.payload = { opaqueKey, value, type }; + if (!this.listening && MAIN_PROCESS) { + Services.ppmm.addMessageListener( + "DragDropFilter:GetOpaqueDrag", + () => this.payload + ); + this.listening = true; } - // Prepare for hostname validation via relative URL building. - text = `//${text}`; - } - // Validate URL or hostname. - try { - new URL(text, "https://localhost"); - return true; - } catch (e) { - // invalid URL, bail out - } - return false; -} - -// Returns true if any chunk of text is URLish -const hasURLish = text => text.split(/[^\p{L}_.-:\/%~@$-]+/u).some(isURLish); + return opaqueKey; + }, + retrieve(key) { + let { opaqueKey, value, type } = this.payload; + if (opaqueKey === key) { + return { value, type }; + } + if (!MAIN_PROCESS) { + this.payload = Services.cpmm.sendSyncMessage( + "DragDropFilter:GetOpaqueDrag" + )[0]; + if (key === this.payload.opaqueKey) { + return this.retrieve(key); + } + } + return EMPTY_PAYLOAD; + }, +}; function DragDropFilter() { this.logger = Cc["@torproject.org/torbutton-logger;1"].getService( Ci.nsISupports ).wrappedJSObject; this.logger.log(3, "Component Load 0: New DragDropFilter."); - - try { - Services.obs.addObserver(this, "on-datatransfer-available"); - } catch (e) { - this.logger.log(5, "Failed to register drag observer"); + if (MAIN_PROCESS) { + // We want to update our status in the main process only, in order to + // serve the same opaque drag payload in every process. + try { + Services.obs.addObserver(this, "on-datatransfer-available"); + } catch (e) { + this.logger.log(5, "Failed to register drag observer"); + } } } @@ -109,23 +115,38 @@ DragDropFilter.prototype = { const types = aDataTransfer.mozTypesAt(i); for (const type of types) { this.logger.log(3, `Type is: ${type}.`); - if ( - URLISH_TYPES.includes(type) || - ((type === "text/plain" || type === "text/html") && - hasURLish(aDataTransfer.getData(type))) - ) { + if (URLISH_TYPES.includes(type)) { this.logger.log( 3, - `Removing transfer data ${aDataTransfer.getData(type)}` + `Removing transfer data ${aDataTransfer.mozGetDataAt(type, i)}` ); + const urlType = "text/x-moz-url"; + // Fallback url type, to be parsed by this browser but not externally + const INTERNAL_FALLBACK = "application/x-torbrowser-opaque"; + if (types.contains(urlType)) { + const link = aDataTransfer.mozGetDataAt(urlType, i); + const opaqueKey = OpaqueDrag.store(link, urlType); + aDataTransfer.mozSetDataAt(INTERNAL_FALLBACK, opaqueKey, i); + } for (const type of types) { - aDataTransfer.clearData(type); + if ( + type !== INTERNAL_FALLBACK && + type !== "text/x-moz-place" // don't touch bookmarks + ) { + aDataTransfer.mozClearDataAt(type, i); + } } break; } } } }, + + opaqueDrag: { + get(opaqueKey) { + return OpaqueDrag.retrieve(opaqueKey); + }, + }, }; // Assign factory to global object. View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbutton/-/commit/a5767f29c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/torbutton/-/commit/a5767f29c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0
by boklm (＠boklm) 13 Dec '22

13 Dec '22

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: c74e0320 by Nicolas Vigier at 2022-12-13T19:54:42+01:00 Bug 40678: Force all 11.5 users to update through 11.5.8 before 12.0 - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -64,3 +64,6 @@ htaccess_rewrite_rules: release: | # bug 26570: Redirect pre-8.0 stable users to a separate update directory RewriteRule ^[^/]+/[4567]\..*/.* https://aus1.torproject.org/torbrowser/update_pre8.0/release/$0 [last] + # tor-browser-build#40678: Force all 11.5 users to update through 11.5.8 before 12.0 + RewriteRule ^[^/]+/[89]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] + RewriteRule ^[^/]+/1[01]\..*/.* https://aus1.torproject.org/torbrowser/update_pre12.0/release/$0 [last] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[tor-browser-bundle-testsuite] branch main updated: The git.tpo repository is no longer updated, gitlab.tpo should be used instead
by gitolite role 13 Dec '22

13 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-bundle-testsuite. The following commit(s) were added to refs/heads/main by this push: new 0342091 The git.tpo repository is no longer updated, gitlab.tpo should be used instead 0342091 is described below commit 03420915806b22536cfb2f35315f169e3db50346 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Dec 13 15:15:52 2022 +0000 The git.tpo repository is no longer updated, gitlab.tpo should be used instead The repository at https://gitweb.torproject.org/tor-browser-bundle-testsuite.git/ (git.torproject.org and git-rw.torproject.org) is no longer updated. Please use the gitlab repository instead: https://gitlab.torproject.org/tpo/applications/tor-browser-bundle-testsuite -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser-spec] branch main updated: The git.tpo repository is no longer updated, gitlab.tpo should be used instead
by gitolite role 13 Dec '22

13 Dec '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository tor-browser-spec. The following commit(s) were added to refs/heads/main by this push: new 789b727 The git.tpo repository is no longer updated, gitlab.tpo should be used instead 789b727 is described below commit 789b727494c2e5435e77ed64a426aa15fbff8a53 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Dec 13 15:12:45 2022 +0000 The git.tpo repository is no longer updated, gitlab.tpo should be used instead The repository at https://gitweb.torproject.org/tor-browser-spec.git/ (git.torproject.org and git-rw.torproject.org) is no longer updated. Please use the gitlab repository instead: https://gitlab.torproject.org/tpo/applications/tor-browser-spec -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] 3 commits: fixup! Add TorStrings module for localization
by Pier Angelo Vendrame (＠pierov) 12 Dec '22

12 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 5688cd7a by Pier Angelo Vendrame at 2022-12-12T20:17:45+01:00 fixup! Add TorStrings module for localization Bug 41375: Cleared unused strings - - - - - 6ae67e05 by Pier Angelo Vendrame at 2022-12-12T20:17:45+01:00 fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser Changed placeholders for strings as we switched from dtd to .properties. - - - - - 96d9ec71 by Pier Angelo Vendrame at 2022-12-12T20:17:45+01:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Changed placeholders for strings as we switched from dtd to .properties. - - - - - 18 changed files: - browser/components/torconnect/content/aboutTorConnect.js - browser/components/torpreferences/content/connectionPane.js - browser/modules/TorStrings.jsm - toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd - toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd - toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd - toolkit/torbutton/chrome/locale/en-US/brand.dtd - toolkit/torbutton/chrome/locale/en-US/brand.properties - toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties - + toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties - − toolkit/torbutton/chrome/locale/en-US/network-settings.dtd - + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties - + toolkit/torbutton/chrome/locale/en-US/rulesets.properties - + toolkit/torbutton/chrome/locale/en-US/settings.properties - + toolkit/torbutton/chrome/locale/en-US/torConnect.properties - toolkit/torbutton/chrome/locale/en-US/torbutton.dtd - toolkit/torbutton/chrome/locale/en-US/torbutton.properties - toolkit/torbutton/chrome/locale/en-US/torlauncher.properties Changes: ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -1,4 +1,7 @@ // Copyright (c) 2021, The Tor Project, Inc. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. /* eslint-env mozilla/frame-script */ @@ -608,7 +611,7 @@ class AboutTorConnect { } showConfigureConnectionLink(text) { - const pieces = text.split("#1"); + const pieces = text.split("%S"); const link = document.createElement("a"); link.textContent = TorStrings.torConnect.configureConnection; link.setAttribute("href", "#"); ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -1,3 +1,8 @@ +// Copyright (c) 2022, The Tor Project, Inc. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + "use strict"; /* global Services, gSubDialog */ @@ -518,10 +523,10 @@ const gConnectionPane = (function() { details && details.transport !== undefined ? details.transport : "vanilla"; - for (const piece of idString.split(/(#[12])/)) { - if (piece == "#1") { + for (const piece of idString.split(/(%[12]\$S)/)) { + if (piece == "%1$S") { id.append(type); - } else if (piece == "#2") { + } else if (piece == "%2$S") { id.append(...emojis); } else { id.append(piece); ===================================== browser/modules/TorStrings.jsm ===================================== @@ -1,74 +1,20 @@ +// Copyright (c) 2022, The Tor Project, Inc. +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + "use strict"; var EXPORTED_SYMBOLS = ["TorStrings"]; -const { XPCOMUtils } = ChromeUtils.import( - "resource://gre/modules/XPCOMUtils.jsm" -); const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm"); +const { AppConstants } = ChromeUtils.import( + "resource://gre/modules/AppConstants.jsm" +); const { getLocale } = ChromeUtils.import( "resource://torbutton/modules/utils.js" ); -XPCOMUtils.defineLazyGlobalGetters(this, ["DOMParser"]); -XPCOMUtils.defineLazyGetter(this, "domParser", () => { - const parser = new DOMParser(); - parser.forceEnableDTD(); - return parser; -}); - -/* - Tor DTD String Bundle - - DTD strings loaded from torbutton/tor-launcher, but provide a fallback in case they aren't available -*/ -class TorDTDStringBundle { - constructor(aBundleURLs, aPrefix) { - const locations = []; - for (const [index, url] of aBundleURLs.entries()) { - locations.push(`<!ENTITY % dtd_${index} SYSTEM "${url}">%dtd_${index};`); - } - this._locations = locations; - this._prefix = aPrefix; - const idx = aBundleURLs.lastIndexOf("/"); - this._filename = idx === -1 ? aBundleURLs : aBundleURLs.substring(idx); - } - - // copied from testing/marionette/l10n.js - localizeEntity(urls, id) { - // Use the DOM parser to resolve the entity and extract its real value - const header = `<?xml version="1.0"?><!DOCTYPE elem [${this._locations.join( - "" - )}]>`; - const elem = `<elem id="elementID">&${id};</elem>`; - const doc = domParser.parseFromString(header + elem, "text/xml"); - const element = doc.querySelector("elem[id='elementID']"); - - if (element === null) { - throw new Error(`Entity with id='${id}' hasn't been found`); - } - - return element.textContent; - } - - getString(key, fallback) { - if (key) { - try { - return this.localizeEntity(this._bundleURLs, `${this._prefix}${key}`); - } catch (e) { - console.warn(`[TorStrings] Cannot get ${key} on ${this._filename}`, e); - } - } - - // on failure, assign the fallback if it exists - if (fallback) { - return fallback; - } - // otherwise return string key - return `$(${key})`; - } -} - /* Tor Property String Bundle @@ -78,16 +24,28 @@ class TorPropertyStringBundle { constructor(aBundleURL, aPrefix) { try { this._bundle = Services.strings.createBundle(aBundleURL); - } catch (e) {} + this._bundleURL = aBundleURL; + } catch (e) { + console.error(`[TorStrings] Cannot load ${aBundleURL}`, e); + } this._prefix = aPrefix; } getString(key, fallback) { + const reportError = + AppConstants.TOR_BROWSER_VERSION === "dev-build" && !!this._bundle; if (key) { try { return this._bundle.GetStringFromName(`${this._prefix}${key}`); - } catch (e) {} + } catch (e) { + if (reportError) { + console.warn( + `[TorStrings] Cannot get ${this._prefix}${key} from ${this._bundleURL}`, + e + ); + } + } } // on failure, assign the fallback if it exists @@ -97,6 +55,15 @@ class TorPropertyStringBundle { // otherwise return string key return `$(${key})`; } + + getStrings(strings) { + return Object.fromEntries( + Object.entries(strings).map(([key, fallback]) => [ + key, + this.getString(key, fallback), + ]) + ); + } } const Loader = { @@ -105,7 +72,7 @@ const Loader = { */ cryptoSafetyPrompt() { const tsb = new TorPropertyStringBundle( - "chrome://torbutton/locale/torbutton.properties", + "chrome://torbutton/locale/cryptoSafetyPrompt.properties", "cryptoSafetyPrompt." ); const getString = tsb.getString.bind(tsb); @@ -138,499 +105,209 @@ const Loader = { Tor about:preferences#connection Strings */ settings() { - const tsb = new TorDTDStringBundle( - ["chrome://torbutton/locale/network-settings.dtd"], - "" - ); - const getString = tsb.getString.bind(tsb); - - const retval = { - categoryTitle: getString("torPreferences.categoryTitle", "Connection"), + const strings = { + categoryTitle: "Connection", // Message box - torPreferencesDescription: getString( - "torPreferences.torSettingsDescription", - "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." - ), + torPreferencesDescription: + "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.", // Status - statusInternetLabel: getString( - "torPreferences.statusInternetLabel", - "Internet:" - ), - statusInternetTest: getString( - "torPreferences.statusInternetTest", - "Test" - ), - statusInternetOnline: getString( - "torPreferences.statusInternetOnline", - "Online" - ), - statusInternetOffline: getString( - "torPreferences.statusInternetOffline", - "Offline" - ), - statusTorLabel: getString( - "torPreferences.statusTorLabel", - "Tor Network:" - ), - statusTorConnected: getString( - "torPreferences.statusTorConnected", - "Connected" - ), - statusTorNotConnected: getString( - "torPreferences.statusTorNotConnected", - "Not Connected" - ), - statusTorBlocked: getString( - "torPreferences.statusTorBlocked", - "Potentially Blocked" - ), - learnMore: getString("torPreferences.learnMore", "Learn more"), + statusInternetLabel: "Internet:", + statusInternetTest: "Test", + statusInternetOnline: "Online", + statusInternetOffline: "Offline", + statusTorLabel: "Tor Network:", + statusTorConnected: "Connected", + statusTorNotConnected: "Not Connected", + statusTorBlocked: "Potentially Blocked", + learnMore: "Learn more", // Quickstart - quickstartHeading: getString("torPreferences.quickstart", "Quickstart"), - quickstartDescription: getString( - "torPreferences.quickstartDescriptionLong", - "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings." - ), - quickstartCheckbox: getString( - "torPreferences.quickstartCheckbox", - "Always connect automatically" - ), + quickstartHeading: "Quickstart", + quickstartDescription: + "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings.", + quickstartCheckbox: "Always connect automatically", // Bridge settings - bridgesHeading: getString("torPreferences.bridges", "Bridges"), - bridgesDescription: getString( - "torPreferences.bridgesDescription", - "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another." - ), - bridgeLocation: getString( - "torPreferences.bridgeLocation", - "Your location" - ), - bridgeLocationAutomatic: getString( - "torPreferences.bridgeLocationAutomatic", - "Automatic" - ), - bridgeLocationFrequent: getString( - "torPreferences.bridgeLocationFrequent", - "Frequently selected locations" - ), - bridgeLocationOther: getString( - "torPreferences.bridgeLocationOther", - "Other locations" - ), - bridgeChooseForMe: getString( - "torPreferences.bridgeChooseForMe", - "Choose a Bridge For Me\u2026" - ), - bridgeCurrent: getString( - "torPreferences.bridgeBadgeCurrent", - "Your Current Bridges" - ), - bridgeCurrentDescription: getString( - "torPreferences.bridgeBadgeCurrentDescription", - "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed." - ), - bridgeId: getString("torPreferences.bridgeId", "#1 bridge: #2"), - remove: getString("torPreferences.remove", "Remove"), - bridgeDisableBuiltIn: getString( - "torPreferences.bridgeDisableBuiltIn", - "Disable built-in bridges" - ), - bridgeShare: getString( - "torPreferences.bridgeShare", - "Share this bridge using the QR code or by copying its address:" - ), - bridgeCopy: getString("torPreferences.bridgeCopy", "Copy Bridge Address"), - copied: getString("torPreferences.copied", "Copied!"), - bridgeShowAll: getString( - "torPreferences.bridgeShowAll", - "Show All Bridges" - ), - bridgeRemoveAll: getString( - "torPreferences.bridgeRemoveAll", - "Remove All Bridges" - ), - bridgeAdd: getString("torPreferences.bridgeAdd", "Add a New Bridge"), - bridgeSelectBrowserBuiltin: getString( - "torPreferences.bridgeSelectBrowserBuiltin", - "Choose from one of Tor Browser’s built-in bridges" - ), - bridgeSelectBuiltin: getString( - "torPreferences.bridgeSelectBuiltin", - "Select a Built-In Bridge\u2026" - ), - bridgeRequestFromTorProject: getString( - "torsettings.useBridges.bridgeDB", - "Request a bridge from torproject.org" - ), - bridgeRequest: getString( - "torPreferences.bridgeRequest", - "Request a Bridge\u2026" - ), - bridgeEnterKnown: getString( - "torPreferences.bridgeEnterKnown", - "Enter a bridge address you already know" - ), - bridgeAddManually: getString( - "torPreferences.bridgeAddManually", - "Add a Bridge Manually\u2026" - ), + bridgesHeading: "Bridges", + bridgesDescription: + "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another.", + bridgeLocation: "Your location", + bridgeLocationAutomatic: "Automatic", + bridgeLocationFrequent: "Frequently selected locations", + bridgeLocationOther: "Other locations", + bridgeChooseForMe: "Choose a Bridge For Me…", + bridgeCurrent: "Your Current Bridges", + bridgeCurrentDescription: + "You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed.", + bridgeId: "#1 bridge: #2", + remove: "Remove", + bridgeDisableBuiltIn: "Disable built-in bridges", + bridgeShare: + "Share this bridge using the QR code or by copying its address:", + bridgeCopy: "Copy Bridge Address", + copied: "Copied!", + bridgeShowAll: "Show All Bridges", + bridgeRemoveAll: "Remove All Bridges", + bridgeAdd: "Add a New Bridge", + bridgeSelectBrowserBuiltin: + "Choose from one of Tor Browser’s built-in bridges", + bridgeSelectBuiltin: "Select a Built-In Bridge…", + bridgeRequestFromTorProject: "Request a bridge from torproject.org", + bridgeRequest: "Request a Bridge…", + bridgeEnterKnown: "Enter a bridge address you already know", + bridgeAddManually: "Add a Bridge Manually…", // Advanced settings - advancedHeading: getString("torPreferences.advanced", "Advanced"), - advancedLabel: getString( - "torPreferences.advancedDescription", - "Configure how Tor Browser connects to the internet" - ), - advancedButton: getString( - "torPreferences.advancedButton", - "Settings\u2026" - ), - showTorDaemonLogs: getString( - "torPreferences.viewTorLogs", - "View the Tor logs" - ), - showLogs: getString("torPreferences.viewLogs", "View Logs\u2026"), + advancedHeading: "Advanced", + advancedLabel: "Configure how Tor Browser connects to the internet", + advancedButton: "Settings…", + showTorDaemonLogs: "View the Tor logs", + showLogs: "View Logs…", // Remove all bridges dialog - removeBridgesQuestion: getString( - "torPreferences.removeBridgesQuestion", - "Remove all the bridges?" - ), - removeBridgesWarning: getString( - "torPreferences.removeBridgesWarning", - "This action cannot be undone." - ), - cancel: getString("torPreferences.cancel", "Cancel"), + removeBridgesQuestion: "Remove all the bridges?", + removeBridgesWarning: "This action cannot be undone.", + cancel: "Cancel", // Scan bridge QR dialog - scanQrTitle: getString("torPreferences.scanQrTitle", "Scan the QR code"), + scanQrTitle: "Scan the QR code", // Builtin bridges dialog - builtinBridgeTitle: getString( - "torPreferences.builtinBridgeTitle", - "Built-In Bridges" - ), - builtinBridgeHeader: getString( - "torsettings.useBridges.default", - "Select a Built-In Bridge" - ), - builtinBridgeDescription: getString( - "torPreferences.builtinBridgeDescription", - "Tor Browser includes some specific types of bridges known as “pluggable transports”." - ), - builtinBridgeObfs4: getString( - "torPreferences.builtinBridgeObfs4", - "obfs4" - ), - builtinBridgeObfs4Description: getString( - "torPreferences.builtinBridgeObfs4Description", - "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges." - ), - builtinBridgeSnowflake: getString( - "torPreferences.builtinBridgeSnowflake", - "Snowflake" - ), - builtinBridgeSnowflakeDescription: getString( - "torPreferences.builtinBridgeSnowflakeDescription", - "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers." - ), - builtinBridgeMeekAzure: getString( - "torPreferences.builtinBridgeMeekAzure", - "meek-azure" - ), - builtinBridgeMeekAzureDescription: getString( - "torPreferences.builtinBridgeMeekAzureDescription", - "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor." - ), + builtinBridgeTitle: "Built-In Bridges", + builtinBridgeHeader: "Select a Built-In Bridge", + builtinBridgeDescription: + "Tor Browser includes some specific types of bridges known as “pluggable transports”.", + builtinBridgeObfs4: "obfs4", + builtinBridgeObfs4Description: + "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges.", + builtinBridgeSnowflake: "Snowflake", + builtinBridgeSnowflakeDescription: + "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers.", + builtinBridgeMeekAzure: "meek-azure", + builtinBridgeMeekAzureDescription: + "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor.", // Request bridges dialog - requestBridgeDialogTitle: getString( - "torPreferences.requestBridgeDialogTitle", - "Request Bridge" - ), - submitCaptcha: getString( - "torsettings.useBridges.captchaSubmit", - "Submit" - ), - contactingBridgeDB: getString( - "torPreferences.requestBridgeDialogWaitPrompt", - "Contacting BridgeDB. Please Wait." - ), - solveTheCaptcha: getString( - "torPreferences.requestBridgeDialogSolvePrompt", - "Solve the CAPTCHA to request a bridge." - ), - captchaTextboxPlaceholder: getString( - "torsettings.useBridges.captchaSolution.placeholder", - "Enter the characters from the image" - ), - incorrectCaptcha: getString( - "torPreferences.requestBridgeErrorBadSolution", - "The solution is not correct. Please try again." - ), + requestBridgeDialogTitle: "Request Bridge", + submitCaptcha: "Submit", + contactingBridgeDB: "Contacting BridgeDB. Please Wait.", + solveTheCaptcha: "Solve the CAPTCHA to request a bridge.", + captchaTextboxPlaceholder: "Enter the characters from the image", + incorrectCaptcha: "The solution is not correct. Please try again.", // Provide bridge dialog - provideBridgeTitle: getString( - "torPreferences.provideBridgeTitle", - "Provide Bridge" - ), - provideBridgeHeader: getString( - "torPreferences.provideBridgeHeader", - "Enter bridge information from a trusted source" - ), - provideBridgePlaceholder: getString( - "torsettings.useBridges.placeholder", - "type address:port (one per line)" - ), + provideBridgeTitle: "Provide Bridge", + provideBridgeHeader: "Enter bridge information from a trusted source", + provideBridgePlaceholder: "type address:port (one per line)", // Connection settings dialog - connectionSettingsDialogTitle: getString( - "torPreferences.connectionSettingsDialogTitle", - "Connection Settings" - ), - connectionSettingsDialogHeader: getString( - "torPreferences.connectionSettingsDialogHeader", - "Configure how Tor Browser connects to the Internet" - ), - useLocalProxy: getString( - "torsettings.useProxy.checkbox", - "I use a proxy to connect to the Internet" - ), - proxyType: getString("torsettings.useProxy.type", "Proxy Type"), - proxyTypeSOCKS4: getString("torsettings.useProxy.type.socks4", "SOCKS4"), - proxyTypeSOCKS5: getString("torsettings.useProxy.type.socks5", "SOCKS5"), - proxyTypeHTTP: getString("torsettings.useProxy.type.http", "HTTP/HTTPS"), - proxyAddress: getString("torsettings.useProxy.address", "Address"), - proxyAddressPlaceholder: getString( - "torsettings.useProxy.address.placeholder", - "IP address or hostname" - ), - proxyPort: getString("torsettings.useProxy.port", "Port"), - proxyUsername: getString("torsettings.useProxy.username", "Username"), - proxyPassword: getString("torsettings.useProxy.password", "Password"), - proxyUsernamePasswordPlaceholder: getString( - "torsettings.optional", - "Optional" - ), - useFirewall: getString( - "torsettings.firewall.checkbox", - "This computer goes through a firewall that only allows connections to certain ports" - ), - allowedPorts: getString( - "torsettings.firewall.allowedPorts", - "Allowed Ports" - ), - allowedPortsPlaceholder: getString( - "torPreferences.firewallPortsPlaceholder", - "Comma-seperated values" - ), + connectionSettingsDialogTitle: "Connection Settings", + connectionSettingsDialogHeader: + "Configure how Tor Browser connects to the Internet", + useLocalProxy: "I use a proxy to connect to the Internet", + proxyType: "Proxy Type", + proxyTypeSOCKS4: "SOCKS4", + proxyTypeSOCKS5: "SOCKS5", + proxyTypeHTTP: "HTTP/HTTPS", + proxyAddress: "Address", + proxyAddressPlaceholder: "IP address or hostname", + proxyPort: "Port", + proxyUsername: "Username", + proxyPassword: "Password", + proxyUsernamePasswordPlaceholder: "Optional", + useFirewall: + "This computer goes through a firewall that only allows connections to certain ports", + allowedPorts: "Allowed Ports", + allowedPortsPlaceholder: "Comma-seperated values", // Log dialog - torLogDialogTitle: getString( - "torPreferences.torLogsDialogTitle", - "Tor Logs" - ), - copyLog: getString("torsettings.copyLog", "Copy Tor Log to Clipboard"), + torLogDialogTitle: "Tor Logs", + copyLog: "Copy Tor Log to Clipboard", + }; + const tsb = new TorPropertyStringBundle( + "chrome://torbutton/locale/settings.properties", + "settings." + ); + return { + ...tsb.getStrings(strings), learnMoreTorBrowserURL: "about:manual#about", learnMoreBridgesURL: "about:manual#bridges", learnMoreBridgesCardURL: "about:manual#bridges_bridge-moji", learnMoreCircumventionURL: "about:manual#circumvention", }; - - return retval; } /* Tor Network Settings Strings */, torConnect() { - const tsbNetwork = new TorDTDStringBundle( - ["chrome://torbutton/locale/network-settings.dtd"], - "" - ); - const tsbLauncher = new TorPropertyStringBundle( - "chrome://torbutton/locale/torlauncher.properties", - "torlauncher." - ); - const tsbCommon = new TorPropertyStringBundle( - "chrome://global/locale/commonDialogs.properties", - "" - ); - - const getStringNet = tsbNetwork.getString.bind(tsbNetwork); - const getStringLauncher = tsbLauncher.getString.bind(tsbLauncher); - const getStringCommon = tsbCommon.getString.bind(tsbCommon); - - return { - torConnect: getStringNet( - "torsettings.wizard.title.default", - "Connect to Tor" - ), - - torConnecting: getStringNet( - "torsettings.wizard.title.connecting", - "Establishing a Connection" - ), - - torNotConnectedConcise: getStringNet( - "torConnect.notConnectedConcise", - "Not Connected" - ), - - torConnectingConcise: getStringNet( - "torConnect.connectingConcise", - "Connecting…" - ), - - tryingAgain: getStringNet("torConnect.tryingAgain", "Trying again…"), - - noInternet: getStringNet( - "torConnect.noInternet", - "Tor Browser couldn’t reach the Internet" - ), + const strings = { + torConnect: "Connect to Tor", - noInternetDescription: getStringNet( - "torConnect.noInternetDescription", - "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again." - ), + torConnecting: "Establishing a Connection", - torBootstrapFailed: getStringLauncher( - "tor_bootstrap_failed", - "Tor failed to establish a Tor network connection." - ), + torNotConnectedConcise: "Not Connected", - couldNotConnect: getStringNet( - "torConnect.couldNotConnect", - "Tor Browser could not connect to Tor" - ), + torConnectingConcise: "Connecting…", - configureConnection: getStringNet( - "torConnect.assistDescriptionConfigure", - "configure your connection" - ), + tryingAgain: "Trying again…", - assistDescription: getStringNet( - "torConnect.assistDescription", - "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead." - ), + noInternet: "Tor Browser couldn’t reach the Internet", + noInternetDescription: + "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again.", + torBootstrapFailed: "Tor failed to establish a Tor network connection.", + couldNotConnect: "Tor Browser could not connect to Tor", + configureConnection: "configure your connection", + assistDescription: + "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead.", + tryingBridge: "Trying a bridge…", - tryingBridge: getStringNet("torConnect.tryingBridge", "Trying a bridge…"), + tryingBridgeAgain: "Trying one more time…", + errorLocation: "Tor Browser couldn’t locate you", + errorLocationDescription: + "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead.", + isLocationCorrect: "Are these location settings correct?", + isLocationCorrectDescription: + "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead.", + finalError: "Tor Browser still cannot connect", - tryingBridgeAgain: getStringNet( - "torConnect.tryingBridgeAgain", - "Trying one more time…" - ), + finalErrorDescription: + "Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead.", + breadcrumbAssist: "Connection assist", + breadcrumbLocation: "Location settings", + breadcrumbTryBridge: "Try a bridge", - errorLocation: getStringNet( - "torConnect.errorLocation", - "Tor Browser couldn’t locate you" - ), + restartTorBrowser: "Restart Tor Browser", - errorLocationDescription: getStringNet( - "torConnect.errorLocationDescription", - "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead." - ), + torConfigure: "Configure Connection…", - isLocationCorrect: getStringNet( - "torConnect.isLocationCorrect", - "Are these location settings correct?" - ), + viewLog: "View logs…", - isLocationCorrectDescription: getStringNet( - "torConnect.isLocationCorrectDescription", - "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead." - ), + torConnectButton: "Connect", - finalError: getStringNet( - "torConnect.finalError", - "Tor Browser still cannot connect" - ), + cancel: "Cancel", - finalErrorDescription: getStringNet( - "torConnect.finalErrorDescription", - "Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead." - ), + torConnected: "Connected to the Tor network", - breadcrumbAssist: getStringNet( - "torConnect.breadcrumbAssist", - "Connection assist" - ), - - breadcrumbLocation: getStringNet( - "torConnect.breadcrumbLocation", - "Location settings" - ), - - breadcrumbTryBridge: getStringNet( - "torConnect.breadcrumbTryBridge", - "Try a bridge" - ), - - restartTorBrowser: getStringNet( - "torConnect.restartTorBrowser", - "Restart Tor Browser" - ), - - torConfigure: getStringNet( - "torConnect.configureConnection", - "Configure Connection…" - ), + torConnectedConcise: "Connected", - viewLog: getStringNet("torConnect.viewLog", "View logs…"), - - torConnectButton: getStringNet("torSettings.connect", "Connect"), - - cancel: getStringCommon("Cancel", "Cancel"), - - torConnected: getStringLauncher( - "torlauncher.bootstrapStatus.done", - "Connected to the Tor network" - ), - - torConnectedConcise: getStringLauncher( - "torConnect.connectedConcise", - "Connected" - ), - - tryAgain: getStringNet("torConnect.tryAgain", "Try Again"), + tryAgain: "Try Again", // tor connect strings for message box in about:preferences#connection - connectMessage: getStringNet( - "torConnect.connectMessage", - "Changes to Tor Settings will not take effect until you connect" - ), - tryAgainMessage: getStringNet( - "torConnect.tryAgainMessage", - "Tor Browser has failed to establish a connection to the Tor Network" - ), + connectMessage: + "Changes to Tor Settings will not take effect until you connect", + tryAgainMessage: + "Tor Browser has failed to establish a connection to the Tor Network", + yourLocation: "Your Location", - yourLocation: getStringNet("torConnect.yourLocation", "Your Location"), + tryBridge: "Try a Bridge", - tryBridge: getStringNet("torConnect.tryBridge", "Try a Bridge"), - - automatic: getStringNet("torConnect.automatic", "Automatic"), - selectCountryRegion: getStringNet( - "torConnect.selectCountryRegion", - "Select Country or Region" - ), - frequentLocations: getStringNet( - "torConnect.frequentLocations", - "Frequently selected locations" - ), - otherLocations: getStringNet( - "torConnect.otherLocations", - "Other locations" - ), + automatic: "Automatic", + selectCountryRegion: "Select Country or Region", + frequentLocations: "Frequently selected locations", + otherLocations: "Other locations", // TorConnect.jsm error messages - offline: getStringNet("torConnect.offline", "Internet not reachable"), - autoBootstrappingFailed: getStringNet( - "torConnect.autoBootstrappingFailed", - "Automatic configuration failed" - ), - autoBootstrappingAllFailed: getStringNet( - "torConnect.autoBootstrappingFailed", - "None of the configurations we tried worked" - ), - cannotDetermineCountry: getStringNet( - "torConnect.cannotDetermineCountry", - "Unable to determine user country" - ), - noSettingsForCountry: getStringNet( - "torConnect.noSettingsForCountry", - "No settings available for your location" - ), + offline: "Internet not reachable", + autoBootstrappingFailed: "Automatic configuration failed", + autoBootstrappingAllFailed: "None of the configurations we tried worked", + cannotDetermineCountry: "Unable to determine user country", + noSettingsForCountry: "No settings available for your location", }; + + const tsb = new TorPropertyStringBundle( + "chrome://torbutton/locale/torConnect.properties", + "torConnect." + ); + return tsb.getStrings(strings); }, /* @@ -819,116 +496,81 @@ const Loader = { OnionLocation */ onionLocation() { + const strings = { + alwaysPrioritize: "Always Prioritize Onionsites", + alwaysPrioritizeAccessKey: "a", + notNow: "Not Now", + notNowAccessKey: "n", + description: + "Website publishers can protect users by adding a security layer. This prevents eavesdroppers from knowing that you are the one visiting that website.", + tryThis: "Try this: Onionsite", + onionAvailable: "Onionsite available", + learnMore: "Learn more", + always: "Always", + askEverytime: "Ask you every time", + prioritizeOnionsDescription: + "Prioritize onionsites when they are available.", + onionServicesTitle: "Onion Services", + }; + const tsb = new TorPropertyStringBundle( - ["chrome://torbutton/locale/torbutton.properties"], + ["chrome://torbutton/locale/onionLocation.properties"], "onionLocation." ); - const getString = tsb.getString.bind(tsb); - - const retval = { - alwaysPrioritize: getString( - "alwaysPrioritize", - "Always Prioritize Onionsites" - ), - alwaysPrioritizeAccessKey: getString("alwaysPrioritizeAccessKey", "a"), - notNow: getString("notNow", "Not Now"), - notNowAccessKey: getString("notNowAccessKey", "n"), - description: getString( - "description", - "Website publishers can protect users by adding a security layer. This prevents eavesdroppers from knowing that you are the one visiting that website." - ), - tryThis: getString("tryThis", "Try this: Onionsite"), - onionAvailable: getString("onionAvailable", "Onionsite available"), - learnMore: getString("learnMore", "Learn more"), + return { + ...tsb.getStrings(strings), 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/${getLocale()}/onion-services/`, - always: getString("always", "Always"), - askEverytime: getString("askEverytime", "Ask you every time"), - prioritizeOnionsDescription: getString( - "prioritizeOnionsDescription", - "Prioritize onionsites when they are available." - ), - onionServicesTitle: getString("onionServicesTitle", "Onion Services"), }; - - return retval; } /* OnionLocation */, /* Rulesets */ rulesets() { - const tsb = new TorPropertyStringBundle( - ["chrome://torbutton/locale/torbutton.properties"], - "rulesets." - ); - const getString = tsb.getString.bind(tsb); - - const retval = { + const strings = { // Initial warning - warningTitle: getString("warningTitle", "Proceed with Caution"), - warningDescription: getString( - "warningDescription", - "Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing." - ), - warningEnable: getString( - "warningEnable", - "Warn me when I attempt to access these preferences" - ), - warningButton: getString("warningButton", "Accept the Risk and Continue"), + warningTitle: "Proceed with Caution", + warningDescription: + "Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing.", + warningEnable: "Warn me when I attempt to access these preferences", + warningButton: "Accept the Risk and Continue", // Ruleset list - rulesets: getString("rulesets", "Rulesets"), - noRulesets: getString("noRulesets", "No rulesets found"), - noRulesetsDescr: getString( - "noRulesetsDescr", - "When you save a ruleset in Tor Browser, it will show up here." - ), - lastUpdated: getString("lastUpdated", "Last updated %S"), - neverUpdated: getString( - "neverUpdated", - "Never updated, or last update failed" - ), - enabled: getString("enabled", "Enabled"), - disabled: getString("disabled", "Disabled"), + rulesets: "Rulesets", + noRulesets: "No rulesets found", + noRulesetsDescr: + "When you save a ruleset in Tor Browser, it will show up here.", + lastUpdated: "Last updated %S", + neverUpdated: "Never updated, or last update failed", + enabled: "Enabled", + disabled: "Disabled", // Ruleset details - edit: getString("edit", "Edit"), - name: getString("name", "Name"), - jwk: getString("jwk", "JWK"), - pathPrefix: getString("pathPrefix", "Path Prefix"), - scope: getString("scope", "Scope"), - enable: getString("enable", "Enable this ruleset"), - checkUpdates: getString("checkUpdates", "Check for Updates"), + edit: "Edit", + name: "Name", + jwk: "JWK", + pathPrefix: "Path Prefix", + scope: "Scope", + enable: "Enable this ruleset", + checkUpdates: "Check for Updates", // Add ruleset - jwkPlaceholder: getString( - "jwkPlaceholder", - "The key used to sign this ruleset in the JWK (JSON Web Key) format" - ), - jwkInvalid: getString( - "jwkInvalid", - "The JWK could not be parsed, or it is not a valid key" - ), - pathPrefixPlaceholder: getString( - "pathPrefixPlaceholder", - "URL prefix that contains the files needed by the ruleset" - ), - pathPrefixInvalid: getString( - "pathPrefixInvalid", - "The path prefix is not a valid HTTP(S) URL" - ), - scopePlaceholder: getString( - "scopePlaceholder", - "Regular expression for the scope of the rules" - ), - scopeInvalid: getString( - "scopeInvalid", - "The scope could not be parsed as a regular expression" - ), - save: getString("save", "Save"), - cancel: getString("cancel", "Cancel"), + jwkPlaceholder: + "The key used to sign this ruleset in the JWK (JSON Web Key) format", + jwkInvalid: "The JWK could not be parsed, or it is not a valid key", + pathPrefixPlaceholder: + "URL prefix that contains the files needed by the ruleset", + pathPrefixInvalid: "The path prefix is not a valid HTTP(S) URL", + scopePlaceholder: "Regular expression for the scope of the rules", + scopeInvalid: "The scope could not be parsed as a regular expression", + save: "Save", + cancel: "Cancel", }; - return retval; + const tsb = new TorPropertyStringBundle( + ["chrome://torbutton/locale/rulesets.properties"], + "rulesets." + ); + return tsb.getStrings(strings); } /* Rulesets */, }; ===================================== toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd ===================================== @@ -1,3 +1,8 @@ + + <!ENTITY project.start "&brandShortName; is developed by ">  <!ENTITY project.tpoLink "the &vendorShortName;"> ===================================== toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd ===================================== @@ -1,3 +1,8 @@ + + <!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> <!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> <!ENTITY aboutTBUpdate.linkPrefix "For the most up-to-date information about this release, "> ===================================== toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd ===================================== @@ -1,8 +1,7 @@ - + <!ENTITY aboutTor.title "About Tor"> ===================================== toolkit/torbutton/chrome/locale/en-US/brand.dtd ===================================== @@ -1,19 +1,9 @@ - -<!ENTITY brandShorterName "Tor Browser"> <!ENTITY brandShortName "Tor Browser"> -<!ENTITY brandFullName "Tor Browser"> -<!ENTITY vendorShortName "Tor Project"> -<!ENTITY trademarkInfo.part1 "'Tor' and the 'Onion Logo' are registered trademarks of the Tor Project, Inc."> - -<!ENTITY brandProductName "Tor Browser"> - -<!ENTITY plugins.installed.find "Click to load installed system plugins"> -<!ENTITY plugins.installed.enable "Enable plugins"> -<!ENTITY plugins.installed.disable "Disable plugins"> -<!ENTITY plugins.installed.disable.tip "Click to prevent loading system plugins"> + +<!ENTITY vendorShortName "Tor Project"> ===================================== toolkit/torbutton/chrome/locale/en-US/brand.properties ===================================== @@ -1,3 +1,4 @@ +# Copyright (c) 2022, The Tor Project, Inc. # This Source Code Form is subject to the terms of the Mozilla Public # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -5,16 +6,3 @@ brandShorterName=Tor Browser brandShortName=Tor Browser brandFullName=Tor Browser -# LOCALIZATION NOTE(brandProductName): -# This brand name can be used in messages where the product name needs to -# remain unchanged across different versions (Nightly, Beta, etc.). -brandProductName=Tor Browser -vendorShortName=Tor Project - -homePageSingleStartMain=Firefox Start, a fast home page with built-in search -homePageImport=Import your home page from %S - -homePageMigrationPageTitle=Home Page Selection -homePageMigrationDescription=Please select the home page you wish to use: - -syncBrandShortName=Sync ===================================== toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties ===================================== @@ -1,6 +1,7 @@ # Copyright (c) 2019, The Tor Project, Inc. -# See LICENSE for licensing information. -# vim: set sw=2 sts=2 ts=8 et: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. onboarding.tour-tor-welcome=Welcome onboarding.tour-tor-welcome.title=You’re ready. ===================================== toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties ===================================== @@ -0,0 +1,14 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# LOCALIZATION NOTE: %S will be replaced with the cryptocurrency address.. +cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. +cryptoSafetyPrompt.whatCanHeading=What can you do about it? +cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. +cryptoSafetyPrompt.learnMore=Learn more +cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit +cryptoSafetyPrompt.primaryActionAccessKey=R +cryptoSafetyPrompt.secondaryAction=Dismiss Warning +cryptoSafetyPrompt.secondaryActionAccessKey=B ===================================== toolkit/torbutton/chrome/locale/en-US/network-settings.dtd deleted ===================================== @@ -1,179 +0,0 @@ -<!ENTITY torsettings.dialog.title "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.default "Connect to Tor"> -<!ENTITY torsettings.wizard.title.configure "Tor Network Settings"> -<!ENTITY torsettings.wizard.title.connecting "Establishing a Connection"> - - -<!ENTITY torlauncher.localePicker.title "Tor Browser Language"> -<!ENTITY torlauncher.localePicker.prompt "Please select a language."> - - - -<!ENTITY torSettings.connectPrompt "Click “Connect” to connect to Tor."> -<!ENTITY torSettings.configurePrompt "Click “Configure” to adjust network settings if you are in a country that censors Tor (such as Egypt, China, Turkey) or if you are connecting from a private network that requires a proxy."> -<!ENTITY torSettings.configure "Configure"> -<!ENTITY torSettings.connect "Connect"> - - - -<!ENTITY torsettings.startingTor "Waiting for Tor to start…"> -<!ENTITY torsettings.restartTor "Restart Tor"> -<!ENTITY torsettings.reconfigTor "Reconfigure"> - -<!ENTITY torsettings.discardSettings.prompt "You have configured Tor bridges or you have entered local proxy settings.  To make a direct connection to the Tor network, these settings must be removed."> -<!ENTITY torsettings.discardSettings.proceed "Remove Settings and Connect"> - -<!ENTITY torsettings.optional "Optional"> - -<!ENTITY torsettings.useProxy.checkbox "I use a proxy to connect to the Internet"> -<!ENTITY torsettings.useProxy.type "Proxy Type"> -<!ENTITY torsettings.useProxy.type.placeholder "select a proxy type"> -<!ENTITY torsettings.useProxy.address "Address"> -<!ENTITY torsettings.useProxy.address.placeholder "IP address or hostname"> -<!ENTITY torsettings.useProxy.port "Port"> -<!ENTITY torsettings.useProxy.username "Username"> -<!ENTITY torsettings.useProxy.password "Password"> -<!ENTITY torsettings.useProxy.type.socks4 "SOCKS 4"> -<!ENTITY torsettings.useProxy.type.socks5 "SOCKS 5"> -<!ENTITY torsettings.useProxy.type.http "HTTP / HTTPS"> -<!ENTITY torsettings.firewall.checkbox "This computer goes through a firewall that only allows connections to certain ports"> -<!ENTITY torsettings.firewall.allowedPorts "Allowed Ports"> -<!ENTITY torsettings.useBridges.checkbox "Tor is censored in my country"> -<!ENTITY torsettings.useBridges.default "Select a Built-In Bridge"> -<!ENTITY torsettings.useBridges.default.placeholder "select a bridge"> -<!ENTITY torsettings.useBridges.bridgeDB "Request a bridge from torproject.org"> -<!ENTITY torsettings.useBridges.captchaSolution.placeholder "Enter the characters from the image"> -<!ENTITY torsettings.useBridges.reloadCaptcha.tooltip "Get a new challenge"> -<!ENTITY torsettings.useBridges.captchaSubmit "Submit"> -<!ENTITY torsettings.useBridges.custom "Provide a bridge I know"> -<!ENTITY torsettings.useBridges.label "Enter bridge information from a trusted source."> -<!ENTITY torsettings.useBridges.placeholder "type address:port (one per line)"> - -<!ENTITY torsettings.copyLog "Copy Tor Log To Clipboard"> - -<!ENTITY torsettings.proxyHelpTitle "Proxy Help"> -<!ENTITY torsettings.proxyHelp1 "A local proxy might be needed when connecting through a company, school, or university network. If you are not sure whether a proxy is needed, look at the Internet settings in another browser or check your system's network settings."> - -<!ENTITY torsettings.bridgeHelpTitle "Bridge Relay Help"> -<!ENTITY torsettings.bridgeHelp1 "Bridges are unlisted relays that make it more difficult to block connections to the Tor Network.  Each type of bridge uses a different method to avoid censorship.  The obfs ones make your traffic look like random noise, and the meek ones make your traffic look like it's connecting to that service instead of Tor."> -<!ENTITY torsettings.bridgeHelp2 "Because of how certain countries try to block Tor, certain bridges work in certain countries but not others.  If you are unsure about which bridges work in your country, visit torproject.org/about/contact.html#support"> - - -<!ENTITY torprogress.pleaseWait "Please wait while we establish a connection to the Tor network.  This may take several minutes."> - - -<!ENTITY torPreferences.categoryTitle "Connection"> -<!ENTITY torPreferences.torSettings "Tor Settings"> -<!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > -<!ENTITY torPreferences.learnMore "Learn more"> - -<!ENTITY torPreferences.statusInternetLabel "Internet:"> -<!ENTITY torPreferences.statusInternetTest "Test"> -<!ENTITY torPreferences.statusInternetOnline "Online"> -<!ENTITY torPreferences.statusInternetOffline "Offline"> -<!ENTITY torPreferences.statusTorLabel "Tor Network:"> -<!ENTITY torPreferences.statusTorConnected "Connected"> -<!ENTITY torPreferences.statusTorNotConnected "Not Connected"> -<!ENTITY torPreferences.statusTorBlocked "Potentially Blocked"> -<!ENTITY torPreferences.learnMore "Learn more"> - -<!ENTITY torPreferences.quickstart "Quickstart"> -<!ENTITY torPreferences.quickstartDescriptionLong "Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings."> -<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically"> - -<!ENTITY torPreferences.bridges "Bridges"> -<!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> -<!ENTITY torPreferences.bridgeLocation "Your location"> -<!ENTITY torPreferences.bridgeLocationAutomatic "Automatic"> -<!ENTITY torPreferences.bridgeLocationFrequent "Frequently selected locations"> -<!ENTITY torPreferences.bridgeLocationOther "Other locations"> -<!ENTITY torPreferences.bridgeChooseForMe "Choose a Bridge For Me…"> -<!ENTITY torPreferences.bridgeBadgeCurrent "Your Current Bridges"> -<!ENTITY torPreferences.bridgeBadgeCurrentDescription "You can save one or more bridges, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed."> -<!ENTITY torPreferences.bridgeId "#1 bridge: #2">  -<!ENTITY torPreferences.remove "Remove"> -<!ENTITY torPreferences.bridgeDisableBuiltIn "Disable built-in bridges"> -<!ENTITY torPreferences.bridgeShare "Share this bridge using the QR code or by copying its address:"> -<!ENTITY torPreferences.bridgeCopy "Copy Bridge Address"> -<!ENTITY torPreferences.copied "Copied!"> -<!ENTITY torPreferences.bridgeShowAll "Show All Bridges"> -<!ENTITY torPreferences.bridgeRemoveAll "Remove All Bridges"> -<!ENTITY torPreferences.bridgeAdd "Add a New Bridge"> -<!ENTITY torPreferences.bridgeSelectBrowserBuiltin "Choose from one of Tor Browser’s built-in bridges"> -<!ENTITY torPreferences.bridgeSelectBuiltin "Select a Built-In Bridge…"> -<!ENTITY torPreferences.bridgeRequest "Request a Bridge…"> -<!ENTITY torPreferences.bridgeEnterKnown "Enter a bridge address you already know"> -<!ENTITY torPreferences.bridgeAddManually "Add a Bridge Manually…"> - -<!ENTITY torPreferences.advanced "Advanced"> -<!ENTITY torPreferences.advancedDescription "Configure how Tor Browser connects to the internet"> -<!ENTITY torPreferences.advancedButton "Settings…"> -<!ENTITY torPreferences.viewTorLogs "View the Tor logs"> -<!ENTITY torPreferences.viewLogs "View Logs…"> - -<!ENTITY torPreferences.removeBridgesQuestion "Remove all the bridges?"> -<!ENTITY torPreferences.removeBridgesWarning "This action cannot be undone."> -<!ENTITY torPreferences.cancel "Cancel"> - -<!ENTITY torPreferences.scanQrTitle "Scan the QR code"> - -<!ENTITY torPreferences.builtinBridgeTitle "Built-In Bridges"> -<!ENTITY torPreferences.builtinBridgeDescription "Tor Browser includes some specific types of bridges known as “pluggable transports”."> -<!ENTITY torPreferences.builtinBridgeObfs4 "obfs4"> -<!ENTITY torPreferences.builtinBridgeObfs4Description "obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges."> -<!ENTITY torPreferences.builtinBridgeSnowflake "Snowflake"> -<!ENTITY torPreferences.builtinBridgeSnowflakeDescription "Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers."> -<!ENTITY torPreferences.builtinBridgeMeekAzure "meek-azure"> -<!ENTITY torPreferences.builtinBridgeMeekAzureDescription "meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor."> - -<!ENTITY torPreferences.requestBridgeDialogTitle "Request Bridge"> -<!ENTITY torPreferences.requestBridgeDialogWaitPrompt "Contacting BridgeDB. Please Wait."> -<!ENTITY torPreferences.requestBridgeDialogSolvePrompt "Solve the CAPTCHA to request a bridge."> -<!ENTITY torPreferences.requestBridgeErrorBadSolution "The solution is not correct. Please try again."> - -<!ENTITY torPreferences.provideBridgeTitle "Provide Bridge"> -<!ENTITY torPreferences.provideBridgeHeader "Enter bridge information from a trusted source"> - -<!ENTITY torPreferences.connectionSettingsDialogTitle "Connection Settings"> -<!ENTITY torPreferences.connectionSettingsDialogHeader "Configure how Tor Browser connects to the Internet"> -<!ENTITY torPreferences.firewallPortsPlaceholder "Comma-seperated values"> - -<!ENTITY torPreferences.torLogsDialogTitle "Tor Logs"> - - -<!ENTITY torConnect.notConnectedConcise "Not Connected"> -<!ENTITY torConnect.connectingConcise "Connecting…"> -<!ENTITY torConnect.tryingAgain "Trying again…"> -<!ENTITY torConnect.noInternet "Tor Browser couldn’t reach the Internet"> -<!ENTITY torConnect.noInternetDescription "This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again."> -<!ENTITY torConnect.couldNotConnect "Tor Browser could not connect to Tor"> -<!ENTITY torConnect.assistDescriptionConfigure "configure your connection">  -<!ENTITY torConnect.assistDescription "If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can #1 manually instead.">  -<!ENTITY torConnect.tryingBridge "Trying a bridge…"> -<!ENTITY torConnect.tryingBridgeAgain "Trying one more time…"> -<!ENTITY torConnect.errorLocation "Tor Browser couldn’t locate you"> -<!ENTITY torConnect.errorLocationDescription "Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, #1 manually instead.">  -<!ENTITY torConnect.isLocationCorrect "Are these location settings correct?"> -<!ENTITY torConnect.isLocationCorrectDescription "Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or #1 instead.">  -<!ENTITY torConnect.finalError "Tor Browser still cannot connect"> -<!ENTITY torConnect.finalErrorDescription "Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead."> -<!ENTITY torConnect.breadcrumbAssist "Connection assist"> -<!ENTITY torConnect.breadcrumbLocation "Location settings"> -<!ENTITY torConnect.breadcrumbTryBridge "Try a bridge"> -<!ENTITY torConnect.automatic "Automatic"> -<!ENTITY torConnect.selectCountryRegion "Select Country or Region"> -<!ENTITY torConnect.frequentLocations "Frequently selected locations"> -<!ENTITY torConnect.otherLocations "Other locations"> -<!ENTITY torConnect.restartTorBrowser "Restart Tor Browser"> -<!ENTITY torConnect.configureConnection "Configure Connection…"> -<!ENTITY torConnect.viewLog "View logs…"> -<!ENTITY torConnect.tryAgain "Try Again"> -<!ENTITY torConnect.offline "Internet not reachable"> -<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect"> -<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> -<!ENTITY torConnect.yourLocation "Your Location"> -<!ENTITY torConnect.tryBridge "Try a Bridge"> -<!ENTITY torConnect.autoBootstrappingFailed "Automatic configuration failed"> -<!ENTITY torConnect.autoBootstrappingFailed "None of the configurations we tried worked"> -<!ENTITY torConnect.cannotDetermineCountry "Unable to determine user country"> -<!ENTITY torConnect.noSettingsForCountry "No settings available for your location"> ===================================== toolkit/torbutton/chrome/locale/en-US/onionLocation.properties ===================================== @@ -0,0 +1,18 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Onion-Location strings. +onionLocation.alwaysPrioritize=Always Prioritize Onions +onionLocation.alwaysPrioritizeAccessKey=a +onionLocation.notNow=Not Now +onionLocation.notNowAccessKey=n +onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. +onionLocation.tryThis=Try Onion Services +onionLocation.onionAvailable=.onion available +onionLocation.learnMore=Learn more… +onionLocation.always=Always +onionLocation.askEverytime=Ask every time +onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. +onionLocation.onionServicesTitle=Onion Services ===================================== toolkit/torbutton/chrome/locale/en-US/rulesets.properties ===================================== @@ -0,0 +1,35 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# about:rulesets strings. +rulesets.warningTitle=Proceed with Caution +rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing. +rulesets.warningEnable=Warn me when I attempt to access these preferences +rulesets.warningButton=Accept the Risk and Continue +# Ruleset list +rulesets.rulesets=Rulesets +rulesets.noRulesets=No rulesets found +rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here. +# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) +rulesets.lastUpdated=Last updated %S +rulesets.neverUpdated=Never updated, or last update failed +rulesets.enabled=Enabled +rulesets.disabled=Disabled +# Ruleset details/edit ruleset +rulesets.edit=Edit +rulesets.name=Name +rulesets.jwk=JWK +rulesets.pathPrefix=Path Prefix +rulesets.scope=Scope +rulesets.enable=Enable this ruleset +rulesets.checkUpdates=Check for Updates +rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format +rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key +rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset +rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL +rulesets.scopePlaceholder=Regular expression for the scope of the rules +rulesets.scopeInvalid=The scope could not be parsed as a regular expression +rulesets.save=Save +rulesets.cancel=Cancel ===================================== toolkit/torbutton/chrome/locale/en-US/settings.properties ===================================== @@ -0,0 +1,114 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +settings.categoryTitle=Connection + +# Message box +settings.torPreferencesDescription=Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. + +# Status +settings.statusInternetLabel=Internet: +settings.statusInternetTest=Test +settings.statusInternetOnline=Online +settings.statusInternetOffline=Offline +settings.statusTorLabel=Tor Network: +settings.statusTorConnected=Connected +settings.statusTorNotConnected=Not Connected +settings.statusTorBlocked=Potentially Blocked +settings.learnMore=Learn more + +# Quickstart +settings.quickstartHeading=Quickstart +settings.quickstartDescription=Quickstart connects Tor Browser to the Tor Network automatically when launched, based on your last used connection settings. +settings.quickstartCheckbox=Always connect automatically + +# Bridge settings +settings.bridgesHeading=Bridges +settings.bridgesDescription=Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another. +settings.bridgeLocation=Your location +settings.bridgeLocationAutomatic=Automatic +settings.bridgeLocationFrequent=Frequently selected locations +settings.bridgeLocationOther=Other locations +settings.bridgeChooseForMe=Choose a Bridge For Me… +settings.bridgeCurrent=Your Current Bridges +settings.bridgeCurrentDescription=You can keep one or more bridges saved, and Tor will choose which one to use when you connect. Tor will automatically switch to use another bridge when needed. + +# Translation note: %1$S = bridge type; %2$S = bridge emoji id +settings.bridgeId=%1$S bridge: %2$S +settings.remove=Remove +settings.bridgeDisableBuiltIn=Disable built-in bridges +settings.bridgeShare=Share this bridge using the QR code or by copying its address: +settings.bridgeCopy=Copy Bridge Address +settings.copied=Copied! +settings.bridgeShowAll=Show All Bridges +settings.bridgeRemoveAll=Remove All Bridges +settings.bridgeAdd=Add a New Bridge +settings.bridgeSelectBrowserBuiltin=Choose from one of Tor Browser’s built-in bridges +settings.bridgeSelectBuiltin=Select a Built-In Bridge… +settings.bridgeRequestFromTorProject=Request a bridge from torproject.org +settings.bridgeRequest=Request a Bridge… +settings.bridgeEnterKnown=Enter a bridge address you already know +settings.bridgeAddManually=Add a Bridge Manually… + +# Advanced settings +settings.advancedHeading=Advanced +settings.advancedLabel=Configure how Tor Browser connects to the internet +settings.advancedButton=Settings… +settings.showTorDaemonLogs=View the Tor logs +settings.showLogs=View Logs… + +# Remove all bridges dialog +settings.removeBridgesQuestion=Remove all the bridges? +settings.removeBridgesWarning=This action cannot be undone. +settings.cancel=Cancel + +# Scan bridge QR dialog +settings.scanQrTitle=Scan the QR code + +# Builtin bridges dialog +settings.builtinBridgeTitle=Built-In Bridges +settings.builtinBridgeHeader=Select a Built-In Bridge +settings.builtinBridgeDescription=Tor Browser includes some specific types of bridges known as “pluggable transports”. +settings.builtinBridgeObfs4=obfs4 +settings.builtinBridgeObfs4Description=obfs4 is a type of built-in bridge that makes your Tor traffic look random. They are also less likely to be blocked than their predecessors, obfs3 bridges. +settings.builtinBridgeSnowflake=Snowflake +settings.builtinBridgeSnowflakeDescription=Snowflake is a built-in bridge that defeats censorship by routing your connection through Snowflake proxies, ran by volunteers. +settings.builtinBridgeMeekAzure=meek-azure +settings.builtinBridgeMeekAzureDescription=meek-azure is a built-in bridge that makes it look like you are using a Microsoft web site instead of using Tor. + +# Request bridges dialog +settings.requestBridgeDialogTitle=Request Bridge +settings.submitCaptcha=Submit +settings.contactingBridgeDB=Contacting BridgeDB. Please Wait. +settings.solveTheCaptcha=Solve the CAPTCHA to request a bridge. +settings.captchaTextboxPlaceholder=Enter the characters from the image +settings.incorrectCaptcha=The solution is not correct. Please try again. + +# Provide bridge dialog +settings.provideBridgeTitle=Provide Bridge +settings.provideBridgeHeader=Enter bridge information from a trusted source +settings.provideBridgePlaceholder=type address:port (one per line) + +# Connection settings dialog +settings.connectionSettingsDialogTitle=Connection Settings +settings.connectionSettingsDialogHeader=Configure how Tor Browser connects to the Internet +settings.useLocalProxy=I use a proxy to connect to the Internet +settings.proxyType=Proxy Type +settings.proxyTypeSOCKS4=SOCKS4 +settings.proxyTypeSOCKS5=SOCKS5 +settings.proxyTypeHTTP=HTTP/HTTPS +settings.proxyAddress=Address +settings.proxyAddressPlaceholder=IP address or hostname +settings.proxyPort=Port +settings.proxyUsername=Username +settings.proxyPassword=Password +settings.proxyUsernamePasswordPlaceholder=Optional +settings.useFirewall=This computer goes through a firewall that only allows connections to certain ports +settings.allowedPorts=Allowed Ports +settings.allowedPortsPlaceholder=Comma-seperated values + +# Log dialog +settings.torLogDialogTitle=Tor Logs +settings.copyLog=Copy Tor Log to Clipboard ===================================== toolkit/torbutton/chrome/locale/en-US/torConnect.properties ===================================== @@ -0,0 +1,52 @@ +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +torConnect.torConnect=Connect to Tor +torConnect.torConnecting=Establishing a Connection +torConnect.torNotConnectedConcise=Not Connected +torConnect.torConnectingConcise=Connecting… +torConnect.tryingAgain=Trying again… +torConnect.noInternet=Tor Browser couldn’t reach the Internet +torConnect.noInternetDescription=This could be due to a connection issue rather than Tor being blocked. Check your Internet connection, proxy and firewall settings before trying again. +torConnect.torBootstrapFailed=Tor failed to establish a Tor network connection. +torConnect.couldNotConnect=Tor Browser could not connect to Tor +# Translation note: used as a text to insert as a link on several strings (%S) +torConnect.configureConnection=configure your connection +# Translation note: %S = "configure your connection" link +torConnect.assistDescription=If Tor is blocked in your location, trying a bridge may help. Connection assist can choose one for you using your location, or you can %S manually instead. +torConnect.tryingBridge=Trying a bridge… +torConnect.tryingBridgeAgain=Trying one more time… +torConnect.errorLocation=Tor Browser couldn’t locate you +# Translation note: %S = "configure your connection" link +torConnect.errorLocationDescription=Tor Browser needs to know your location in order to choose the right bridge for you. If you’d rather not share your location, %S manually instead. +torConnect.isLocationCorrect=Are these location settings correct? +# Translation note: %S = "configure your connection" link +torConnect.isLocationCorrectDescription=Tor Browser still couldn’t connect to Tor. Please check your location settings are correct and try again, or %S instead. +torConnect.finalError=Tor Browser still cannot connect +torConnect.finalErrorDescription=Despite its best efforts, connection assist was not able to connect to Tor. Try troubleshooting your connection and adding a bridge manually instead. +torConnect.breadcrumbAssist=Connection assist +torConnect.breadcrumbLocation=Location settings +torConnect.breadcrumbTryBridge=Try a bridge +torConnect.restartTorBrowser=Restart Tor Browser +torConnect.torConfigure=Configure Connection… +torConnect.viewLog=View logs… +torConnect.torConnectButton=Connect +torConnect.cancel=Cancel +torConnect.torConnected=Connected to the Tor network! +torConnect.torConnectedConcise=Connected +torConnect.tryAgain=Try Again +torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect +torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network +torConnect.yourLocation=Your Location +torConnect.tryBridge=Try a Bridge +torConnect.automatic=Automatic +torConnect.selectCountryRegion=Select Country or Region +torConnect.frequentLocations=Frequently selected locations +torConnect.otherLocations=Other locations +torConnect.offline=Internet not reachable +torConnect.autoBootstrappingFailed=Automatic configuration failed +torConnect.autoBootstrappingAllFailed=None of the configurations we tried worked +torConnect.cannotDetermineCountry=Unable to determine user country +torConnect.noSettingsForCountry=No settings available for your location ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.dtd ===================================== @@ -1,28 +1,20 @@ -<!ENTITY torbutton.context_menu.new_identity "New Identity"> -<!ENTITY torbutton.context_menu.new_identity_sentence_case "New identity"> -<!ENTITY torbutton.context_menu.new_identity_key "I"> + + <!ENTITY torbutton.context_menu.new_circuit "New Tor Circuit for this Site"> <!ENTITY torbutton.context_menu.new_circuit_sentence_case "New Tor circuit for this site"> <!ENTITY torbutton.context_menu.new_circuit_key "C"> -<!ENTITY torbutton.context_menu.networksettings "Tor Network Settings…"> -<!ENTITY torbutton.context_menu.networksettings.key "N"> -<!ENTITY torbutton.context_menu.downloadUpdate "Check for Tor Browser Update…"> -<!ENTITY torbutton.context_menu.downloadUpdate.key "U"> -<!ENTITY torbutton.context_menu.cookieProtections "Cookie Protections…"> -<!ENTITY torbutton.context_menu.cookieProtections.key "C"> -<!ENTITY torbutton.button.tooltip "Click to initialize Torbutton"> + +<!ENTITY torbutton.circuit_display.title "Tor Circuit"> +<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> + + +<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> +<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> + <!ENTITY torbutton.prefs.security_settings "Tor Browser Security Settings"> -<!ENTITY torbutton.cookiedialog.title "Manage Cookie Protections"> -<!ENTITY torbutton.cookiedialog.lockCol "Protected"> -<!ENTITY torbutton.cookiedialog.domainCol "Host"> -<!ENTITY torbutton.cookiedialog.nameCol "Name"> -<!ENTITY torbutton.cookiedialog.pathCol "Path"> -<!ENTITY torbutton.cookiedialog.protectCookie "Protect Cookie"> -<!ENTITY torbutton.cookiedialog.removeCookie "Remove Cookie"> -<!ENTITY torbutton.cookiedialog.unprotectCookie "Unprotect Cookie"> -<!ENTITY torbutton.cookiedialog.removeAllBut "Remove All But Protected"> -<!ENTITY torbutton.cookiedialog.saveAllCookies "Protect New Cookies"> -<!ENTITY torbutton.cookiedialog.doNotSaveAllCookies "Do Not Protect New Cookies"> <!ENTITY torbutton.prefs.sec_caption "Security Level"> <!ENTITY torbutton.prefs.sec_caption_tooltip "The Security Slider lets you disable certain browser features that may make your browser more vulnerable to hacking attempts."> <!ENTITY torbutton.prefs.sec_standard_label "Standard"> @@ -48,9 +40,3 @@ <!ENTITY torbutton.prefs.sec_restore_defaults "Restore Defaults"> <!ENTITY torbutton.prefs.sec_advanced_security_settings "Advanced Security Settings…"> <!ENTITY torbutton.prefs.sec_change "Change…"> -<!ENTITY torbutton.circuit_display.title "Tor Circuit"> -<!ENTITY torbutton.circuit_display.new_circuit "New Circuit for this Site"> - - -<!ENTITY torbutton.onionServices.authPrompt.tooltip "Open onion service client authentication prompt"> -<!ENTITY torbutton.onionServices.authPrompt.persistCheckboxLabel "Remember this key"> ===================================== toolkit/torbutton/chrome/locale/en-US/torbutton.properties ===================================== @@ -1,6 +1,9 @@ -torbutton.circuit_display.internet = Internet -torbutton.circuit_display.ip_unknown = IP unknown -torbutton.circuit_display.onion_site = Onion site +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# Circuit display torbutton.circuit_display.this_browser = This browser torbutton.circuit_display.relay = Relay torbutton.circuit_display.tor_bridge = Bridge @@ -10,8 +13,8 @@ torbutton.circuit_display.guard_note = Your [Guard] node may not change. torbutton.circuit_display.learn_more = Learn more torbutton.circuit_display.click_to_copy = Click to Copy torbutton.circuit_display.copied = Copied! -torbutton.content_sizer.margin_tooltip = Tor Browser adds this margin to make the width and height of your window less distinctive, and thus reduces the ability of people to track you online. -extensions.torbutton(a)torproject.org.description = Torbutton provides a button to configure Tor settings and quickly and easily clear private browsing data. + +# External app blocker torbutton.popup.external.title = Download an external file type? torbutton.popup.external.app = Tor Browser cannot display this file. You will need to open it with another application.\n\n torbutton.popup.external.note = Some types of files can cause applications to connect to the Internet without using Tor.\n\n @@ -19,47 +22,37 @@ torbutton.popup.external.suggest = To be safe, you should only open downloaded f torbutton.popup.launch = Download file torbutton.popup.cancel = Cancel torbutton.popup.dontask = Automatically download files from now on -torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? -torbutton.security_settings.menu.title = Security Settings -torbutton.title.prompt_torbrowser = Important Torbutton Information -torbutton.popup.prompt_torbrowser = Torbutton works differently now: you can't turn it off any more.\n\nWe made this change because it isn't safe to use Torbutton in a browser that's also used for non-Tor browsing. There were too many bugs there that we couldn't fix any other way.\n\nIf you want to keep using Firefox normally, you should uninstall Torbutton and download Tor Browser Bundle. The privacy properties of Tor Browser are also superior to those of normal Firefox, even when Firefox is used with Torbutton.\n\nTo remove Torbutton, go to Tools->Addons->Extensions and then click the Remove button next to Torbutton. -torbutton.popup.short_torbrowser = Important Torbutton Information!\n\nTorbutton is now always enabled.\n\nClick on the Torbutton for more information. - -torbutton.popup.confirm_plugins = Plugins such as Flash can harm your privacy and anonymity.\n\nThey can also bypass Tor to reveal your current location and IP address.\n\nAre you sure you want to enable plugins?\n\n -torbutton.popup.never_ask_again = Never ask me again -torbutton.popup.confirm_newnym = Tor Browser will close all windows and tabs. All website sessions will be lost.\n\nRestart Tor Browser now to reset your identity?\n\n -torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. - -# Canvas permission prompt. Strings are kept here for ease of translation. -canvas.siteprompt=This website (%S) attempted to extract HTML5 canvas image data, which may be used to uniquely identify your computer.\n\nShould Tor Browser allow this website to extract HTML5 canvas image data? -canvas.notNow=Not Now -canvas.notNowAccessKey=N -canvas.allow=Allow in the future -canvas.allowAccessKey=A -canvas.never=Never for this site (recommended) -canvas.neverAccessKey=e - -# Profile/startup error messages. Strings are kept here for ease of translation. -# LOCALIZATION NOTE: %S is the application name. -profileProblemTitle=%S Profile Problem -profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. -profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. -profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. -profileMigrationFailed=Migration of your existing %S profile failed.\nNew settings will be used. - -# "Downloading update" string for the hamburger menu (see #28885). -# This string is kept here for ease of translation. -# LOCALIZATION NOTE: %S is the application name. -updateDownloadingPanelUILabel=Downloading %S update - -# .Onion Page Info prompt. Strings are kept here for ease of translation. +# .Onion Page Info prompt. pageInfo_OnionEncryptionWithBitsAndProtocol=Connection Encrypted (Onion Service, %1$S, %2$S bit keys, %3$S) pageInfo_OnionEncryption=Connection Encrypted (Onion Service) -pageInfo_OnionName=Onion Name: -# Onion services strings. Strings are kept here for ease of translation.. +# Shared between Onion Auth prompt and preferences onionServices.learnMore=Learn more + +# Onion Services Authentication prompt +# LOCALIZATION NOTE: %S will be replaced with the .onion address. +onionServices.authPrompt.description2=%S is requesting that you authenticate. +onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service +onionServices.authPrompt.done=Done +onionServices.authPrompt.doneAccessKey=d +onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) +onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key + +# Onion Services Authentication preferences +onionServices.authPreferences.header=Onion Services Authentication +onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. +onionServices.authPreferences.savedKeys=Saved Keys… +onionServices.authPreferences.dialogTitle=Onion Service Keys +onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer +onionServices.authPreferences.onionSite=Onionsite +onionServices.authPreferences.onionKey=Key +onionServices.authPreferences.remove=Remove +onionServices.authPreferences.removeAll=Remove All +onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor +onionServices.authPreferences.failedToRemoveKey=Unable to remove key + +# Onion services error strings. onionServices.errorPage.browser=Browser onionServices.errorPage.network=Network onionServices.errorPage.onionSite=Onionsite @@ -105,83 +98,23 @@ onionServices.introTimedOut.pageTitle=Problem Loading Onionsite onionServices.introTimedOut.header=Onionsite Circuit Creation Timed Out onionServices.introTimedOut=Failed to connect to the onionsite, possibly due to a poor network connection. onionServices.introTimedOut.longDescription=Details: %S — The connection to the requested onion service timed out while trying to build the rendezvous circuit. -# -# LOCALIZATION NOTE: %S will be replaced with the .onion address. -onionServices.authPrompt.description2=%S is requesting that you authenticate. -onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service -onionServices.authPrompt.done=Done -onionServices.authPrompt.doneAccessKey=d -onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters) -onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key -onionServices.authPreferences.header=Onion Services Authentication -onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them. -onionServices.authPreferences.savedKeys=Saved Keys… -onionServices.authPreferences.dialogTitle=Onion Service Keys -onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer -onionServices.authPreferences.onionSite=Onionsite -onionServices.authPreferences.onionKey=Key -onionServices.authPreferences.remove=Remove -onionServices.authPreferences.removeAll=Remove All -onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor -onionServices.authPreferences.failedToRemoveKey=Unable to remove key -onionServices.v2Deprecated.pageTitle=V2 Onion Site Deprecation Warning -onionServices.v2Deprecated.header=Version 2 Onion Sites will be deprecated soon -onionServices.v2Deprecated=This onion site will not be reachable soon. Please contact the site administrator and encourage them to upgrade. -onionServices.v2Deprecated.longDescription=Tor is ending its support for version 2 onion services beginning in July 2021, and this onion site will no longer be reachable at this address. If you are the site administrator, upgrade to a version 3 onion service soon. -onionServices.v2Deprecated.tryAgain=Got it -onionServices.v2Deprecated.tooltip=This onion site will not be reachable soon -# Onion-Location strings. -onionLocation.alwaysPrioritize=Always Prioritize Onions -onionLocation.alwaysPrioritizeAccessKey=a -onionLocation.notNow=Not Now -onionLocation.notNowAccessKey=n -onionLocation.description=There's a more private and secure version of this site available over the Tor network via onion services. Onion services help website publishers and their visitors defeat surveillance and censorship. -onionLocation.tryThis=Try Onion Services -onionLocation.onionAvailable=.onion available -onionLocation.learnMore=Learn more… -onionLocation.always=Always -onionLocation.askEverytime=Ask every time -onionLocation.prioritizeOnionsDescription=Prioritize .onion sites when known. -onionLocation.onionServicesTitle=Onion Services +# Profile/startup error messages. +# LOCALIZATION NOTE: %S is the application name. +profileProblemTitle=%S Profile Problem +profileReadOnly=You cannot run %S from a read-only file system. Please copy %S to another location before trying to use it. +profileReadOnlyMac=You cannot run %S from a read-only file system. Please copy %S to your Desktop or Applications folder before trying to use it. +profileAccessDenied=%S does not have permission to access the profile. Please adjust your file system permissions and try again. + +# New identity warning +torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? + + +## Legacy -# LOCALIZATION NOTE: %S will be replaced with the cryptocurrency address.. -cryptoSafetyPrompt.cryptoWarning=A cryptocurrency address (%S) has been copied from an insecure website. It could have been modified. -cryptoSafetyPrompt.whatCanHeading=What can you do about it? -cryptoSafetyPrompt.whatCanBody=You can try reconnecting with a new circuit to establish a secure connection, or accept the risk and dismiss this warning. -cryptoSafetyPrompt.learnMore=Learn more -cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit -cryptoSafetyPrompt.primaryActionAccessKey=R -cryptoSafetyPrompt.secondaryAction=Dismiss Warning -cryptoSafetyPrompt.secondaryActionAccessKey=B +# Preferences for mobile: these strings are still referenced, but we should +# check whether this feature is still used +torbutton.security_settings.menu.title = Security Settings -# about:rulesets strings. -rulesets.warningTitle=Proceed with Caution -rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing. -rulesets.warningEnable=Warn me when I attempt to access these preferences -rulesets.warningButton=Accept the Risk and Continue -# Ruleset list -rulesets.rulesets=Rulesets -rulesets.noRulesets=No rulesets found -rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here. -# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) -rulesets.lastUpdated=Last updated %S -rulesets.neverUpdated=Never updated, or last update failed -rulesets.enabled=Enabled -rulesets.disabled=Disabled -# Ruleset details/edit ruleset -rulesets.edit=Edit -rulesets.name=Name -rulesets.jwk=JWK -rulesets.pathPrefix=Path Prefix -rulesets.scope=Scope -rulesets.enable=Enable this ruleset -rulesets.checkUpdates=Check for Updates -rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format -rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key -rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset -rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL -rulesets.scopePlaceholder=Regular expression for the scope of the rules -rulesets.scopeInvalid=The scope could not be parsed as a regular expression -rulesets.save=Save -rulesets.cancel=Cancel \ No newline at end of file +# Other legacy stuff we might just remove since we are using letterbox +torbutton.maximize_warning = Maximizing Tor Browser can allow websites to determine your monitor size, which can be used to track you. We recommend that you leave Tor Browser windows in their original default size. ===================================== toolkit/torbutton/chrome/locale/en-US/torlauncher.properties ===================================== @@ -1,14 +1,15 @@ -### Copyright (c) 2020, The Tor Project, Inc. -### See LICENSE for licensing information. +# Copyright (c) 2022, The Tor Project, Inc. +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. torlauncher.error_title=Tor Launcher torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start. torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, Tor Browser will not be able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team. torlauncher.tor_exited2=Restarting Tor will not close your browser tabs. +torlauncher.restart_tor=Restart Tor torlauncher.tor_controlconn_failed=Could not connect to Tor control port. -torlauncher.tor_failed_to_start=Tor failed to start. -torlauncher.tor_control_failed=Failed to take control of Tor. torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection. torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S). @@ -19,40 +20,6 @@ torlauncher.datadir_missing=The Tor data directory does not exist and could not torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created. torlauncher.password_hash_missing=Failed to get hashed password. -torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S -torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S -torlauncher.ensure_tor_is_running=Please ensure that Tor is running. - -torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet. -torlauncher.error_proxy_type_missing=You must select the proxy type. -torlauncher.error_bridges_missing=You must specify one or more bridges.. -torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges. -torlauncher.error_bridgedb_bridges_missing=Please request a bridge. -torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings. - -torlauncher.bridge_suffix.meek-amazon=(works in China) -torlauncher.bridge_suffix.meek-azure=(works in China) - -torlauncher.request_a_bridge=Request a Bridge… -torlauncher.request_a_new_bridge=Request a New Bridge… -torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait. -torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge. -torlauncher.bad_captcha_solution=The solution is not correct. Please try again. -torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S -torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges. -torlauncher.no_bridges_available=No bridges are available at this time. Sorry. - -torlauncher.connect=Connect -torlauncher.restart_tor=Restart Tor -torlauncher.quit=Quit -torlauncher.quit_win=Exit -torlauncher.done=Done - -torlauncher.forAssistance=For assistance, contact %S -torlauncher.forAssistance2=For assistance, visit %S - -torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message. - torlauncher.bootstrapStatus.starting=Starting torlauncher.bootstrapStatus.conn_pt=Connecting to bridge torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge @@ -93,5 +60,3 @@ torlauncher.bootstrapWarning.pt_missing=missing pluggable transport torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost. torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server. torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy. - -torlauncher.copiedNLogMessagesShort=Copied %S Logs View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3844f0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/3844f0… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.5.0esr-12.5-1] fixup! Bug 10760: Integrate TorButton to TorBrowser core
by Pier Angelo Vendrame (＠pierov) 12 Dec '22

12 Dec '22

Pier Angelo Vendrame pushed to branch tor-browser-102.5.0esr-12.5-1 at The Tor Project / Applications / Tor Browser Commits: 3844f07c by Poncho at 2022-12-12T20:13:26+01:00 fixup! Bug 10760: Integrate TorButton to TorBrowser core Bug 41519: honor the TOR_SOCKS_IPC_PATH variable Add back FileUtils which was accidentaly removed in 004b629b Fixes: "ReferenceError: FileUtils is not defined startup-observer.js:121" - - - - - 1 changed file: - toolkit/torbutton/components/startup-observer.js Changes: ===================================== toolkit/torbutton/components/startup-observer.js ===================================== @@ -26,6 +26,7 @@ const { TorProtocolService } = ChromeUtils.import( XPCOMUtils.defineLazyModuleGetters(this, { ComponentUtils: "resource://gre/modules/ComponentUtils.jsm", + FileUtils: "resource://gre/modules/FileUtils.jsm", }); // Module specific constants View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3844f07… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/3844f07… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-102.6.0esr-12.0-1-build1
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed new tag tor-browser-102.6.0esr-12.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag base-browser-102.6.0esr-12.0-1-build1
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed new tag base-browser-102.6.0esr-12.0-1-build1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/base-brow… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-102.6.0esr-12.0-1] 60 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed to branch base-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: a9a347c6 by Pier Angelo Vendrame at 2022-12-09T12:46:57+01:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - 8e214a62 by Pier Angelo Vendrame at 2022-12-09T12:46:57+01:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - 490a43f2 by Jamie Nicol at 2022-12-09T12:46:58+01:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 61a55f43 by Pier Angelo Vendrame at 2022-12-09T12:46:58+01:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 3e073dda by Neill Miller at 2022-12-09T12:46:59+01:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - cfaaf97a by Gabriele Svelto at 2022-12-09T12:46:59+01:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - aedce60f by Gabriele Svelto at 2022-12-09T12:47:00+01:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - d1b2d56b by Gabriele Svelto at 2022-12-09T12:47:00+01:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - e8dd566c by Gabriele Svelto at 2022-12-09T12:47:01+01:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 5abe5207 by Georg Koppen at 2022-12-09T12:47:01+01:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - dba28f2f by Richard Pospesel at 2022-12-09T12:47:02+01:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - a8fc0774 by Henry Wilkes at 2022-12-09T12:47:02+01:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 9fdb1fb1 by Pier Angelo Vendrame at 2022-12-09T12:47:03+01:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - bc6864d5 by Pier Angelo Vendrame at 2022-12-09T12:47:03+01:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 99d96677 by Dan Ballard at 2022-12-09T12:47:04+01:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restpre email link on mac - - - - - bdc67678 by Gaba at 2022-12-09T12:47:04+01:00 Adding issue template for bugs. - - - - - bdf5e0ee by Pier Angelo Vendrame at 2022-12-09T12:47:05+01:00 Base Browser's .mozconfigs. - - - - - 1c547bae by Pier Angelo Vendrame at 2022-12-09T12:47:05+01:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 5af007ef by Dan Ballard at 2022-12-09T12:47:06+01:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - ba175aeb by Matthew Finkel at 2022-12-09T12:47:06+01:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 42b18efc by Matthew Finkel at 2022-12-09T12:47:06+01:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 301dd582 by Matthew Finkel at 2022-12-09T12:47:07+01:00 Bug 28125: Prevent non-Necko network connections - - - - - cb7c318d by Mike Perry at 2022-12-09T12:47:07+01:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 2096a7c2 by Alex Catarineu at 2022-12-09T12:47:08+01:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - fc0e1f62 by Georg Koppen at 2022-12-09T12:47:08+01:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 3acb261c by Kathy Brade at 2022-12-09T12:47:09+01:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 33869162 by Kathy Brade at 2022-12-09T12:47:09+01:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 656bb482 by Alex Catarineu at 2022-12-09T12:47:10+01:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 21bd3448 by Kathy Brade at 2022-12-09T12:47:10+01:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - 1a66a537 by Arthur Edelstein at 2022-12-09T12:47:11+01:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 7a45a690 by Alex Catarineu at 2022-12-09T12:47:11+01:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - c97b6977 by Georg Koppen at 2022-12-09T12:47:12+01:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 681466cd by Alex Catarineu at 2022-12-09T12:47:12+01:00 Bug 28369: Stop shipping pingsender executable - - - - - 771dd9df by Alex Catarineu at 2022-12-09T12:47:12+01:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - d03ee771 by Mike Perry at 2022-12-09T12:47:13+01:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - baa5d166 by Pier Angelo Vendrame at 2022-12-09T12:47:13+01:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - e57cc939 by Alex Catarineu at 2022-12-09T12:47:14+01:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 7a9c7653 by Alex Catarineu at 2022-12-09T12:47:14+01:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - add753b6 by Alex Catarineu at 2022-12-09T12:47:15+01:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 52611f3d by Alex Catarineu at 2022-12-09T12:47:15+01:00 Bug 26345: Hide tracking protection UI - - - - - 0d9069de by Kathy Brade at 2022-12-09T12:47:16+01:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - 32988ddc by Kathy Brade at 2022-12-09T12:47:16+01:00 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1769028 - - - - - c9fb214b by Alex Catarineu at 2022-12-09T12:47:17+01:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 45c7a08f by Mike Perry at 2022-12-09T12:47:17+01:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 6b3ee7fd by Kathy Brade at 2022-12-09T12:47:18+01:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 33277907 by Igor Oliveira at 2022-12-09T12:47:18+01:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - 1c1a67ef by Pier Angelo Vendrame at 2022-12-09T12:47:18+01:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 135eb036 by Matthew Finkel at 2022-12-09T12:47:19+01:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - ab6f6e86 by hackademix at 2022-12-09T12:47:19+01:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 906f8dca by hackademix at 2022-12-09T12:47:20+01:00 Bug 41434: Letterboxing, improve logging. - - - - - 6606bb8e by hackademix at 2022-12-09T12:47:20+01:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - f3cbba4e by hackademix at 2022-12-09T12:47:21+01:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 8affcce7 by Richard Pospesel at 2022-12-09T12:47:21+01:00 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and outline are tied to the currently selected theme. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1594455 - - - - - 088bb96b by Alex Catarineu at 2022-12-09T12:47:22+01:00 Bug 40069: Add helpers for message passing with extensions - - - - - fb5b5683 by Matthew Finkel at 2022-12-09T12:47:22+01:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 0bf39c39 by Pier Angelo Vendrame at 2022-12-09T12:47:23+01:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 72248ce8 by Henry Wilkes at 2022-12-09T12:47:23+01:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - 7d7c220f by Pier Angelo Vendrame at 2022-12-09T12:47:24+01:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - bfe4c248 by Pier Angelo Vendrame at 2022-12-09T12:47:24+01:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - bc629c0c by Pier Angelo Vendrame at 2022-12-09T12:47:25+01:00 Bug 40926: Implemented the New Identity feature - - - - - 30 changed files: - .eslintignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js - browser/base/content/browser.css - browser/base/content/browser.js - browser/base/content/browser.xhtml - + browser/base/content/languageNotification.js - browser/base/content/main-popupset.inc.xhtml - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/jar.mn - + browser/branding/alpha/document_pdf.ico - browser/components/BrowserGlue.jsm - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/aboutlogins/AboutLoginsParent.jsm - browser/components/aboutlogins/content/aboutLogins.css - browser/components/aboutlogins/content/aboutLogins.js - browser/components/aboutlogins/content/components/fxaccounts-button.css - browser/components/moz.build - + browser/components/newidentity/content/newidentity.js - + browser/components/newidentity/jar.mn - + browser/components/newidentity/locale/en-US/newIdentity.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-102.6.0esr-12.0-1] 91 commits: Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser Commits: a9a347c6 by Pier Angelo Vendrame at 2022-12-09T12:46:57+01:00 Bug 1774413: Bundled fonts are not picked up on macOS r=jfkthame Bundled fonts were not picked up because also child processes need to register them. Also, they were assigned User visibility, instead of Base, which was not coherent with other platforms. Differential Revision: https://phabricator.services.mozilla.com/D150400 - - - - - 8e214a62 by Pier Angelo Vendrame at 2022-12-09T12:46:57+01:00 Bug 1769030: Add a configure flag to load policies only from the local policies.json file r=mkaply,glandium Add a configuration flag to make Enterprise Policies mechanism only consult a policies.json file (avoiding the Windows Registry, macOS's file system attributes, and /etc/firefox/policies/policies.json on other OS). Differential Revision: https://phabricator.services.mozilla.com/D146300 - - - - - 490a43f2 by Jamie Nicol at 2022-12-09T12:46:58+01:00 Bug 1784588 - Fix SplitDriverVersion when the string has less than 4 numbers. r=aosmond Differential Revision: https://phabricator.services.mozilla.com/D154897 - - - - - 61a55f43 by Pier Angelo Vendrame at 2022-12-09T12:46:58+01:00 Bug 1768907 - Part 1: Make browser.privatebrowsing.autostart a static pref. r=handyman,necko-reviewers Differential Revision: https://phabricator.services.mozilla.com/D157843 - - - - - 3e073dda by Neill Miller at 2022-12-09T12:46:59+01:00 Bug 1768907 - Part 2: nsTransferable disk-leaks when private browsing mode is enabled by default. r=handyman nsTransferable was modified to prevent disk leakings when copying data in private browsing mode with Bug 1123480. However, the context is nullptr when it is initialized, so it still leaks if PBM is enabled by default. Our solution is to check the browser.privatebrowsing.autostart in this condition. Differential Revision: https://phabricator.services.mozilla.com/D157800 - - - - - cfaaf97a by Gabriele Svelto at 2022-12-09T12:46:59+01:00 Bug 1670885 - Fix post-fork() handlers for PHC/LogAlloc to work on macOS using unfair locks r=glandium macOS unfair locks enforce that a lock can only be released by the thread which locked it. On macOS 11+ this caused the fork()'d child process to raise a SIGILL signal. Confusingly enough this behavior seems to be different on macOS 10.15 and possibly interacted in odd ways with our exception handler if it was installed before fork()-ing. Differential Revision: https://phabricator.services.mozilla.com/D148287 - - - - - aedce60f by Gabriele Svelto at 2022-12-09T12:47:00+01:00 Bug 1670885 - Replace deprecated NSSpinLocks with os_unfair_locks in the memory allocator r=glandium Depends on D148287 Differential Revision: https://phabricator.services.mozilla.com/D99280 - - - - - d1b2d56b by Gabriele Svelto at 2022-12-09T12:47:00+01:00 Bug 1774458 - Use undocumented, non-public adaptive spinlocks on macOS 10.15+, revert to user-space spinlocks on older versions r=pbone Differential Revision: https://phabricator.services.mozilla.com/D149599 - - - - - e8dd566c by Gabriele Svelto at 2022-12-09T12:47:01+01:00 Bug 1784018 - Remove deprecated OSSpinLocks r=glandium On macOS versions prior to 10.15 os_unfair_locks cannot spin in kernel-space which degrades performance significantly. To obviate for this we spin in user-space like OSSpinLock does, for the same number of times and invoking x86-specific pause instructions in-between the locking attempts to avoid starving a thread that might be running on the same physical core. Differential Revision: https://phabricator.services.mozilla.com/D154205 - - - - - 5abe5207 by Georg Koppen at 2022-12-09T12:47:01+01:00 Revert "Bug 1724777, optimize suppressed MicroTask handling, r=mccr8 a=RyanVM" This reverts commit 1eb1364357ac5bc2a4531337fb5416af39c3793f. This fixes tor-browser#40721, tor-browser#40698, and tor-browser#40706. However, it is a temporary workaround, that we should revert once https://bugzilla.mozilla.org/show_bug.cgi?id=1744719 is fixed. - - - - - dba28f2f by Richard Pospesel at 2022-12-09T12:47:02+01:00 fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum - - - - - a8fc0774 by Henry Wilkes at 2022-12-09T12:47:02+01:00 Bug 41454: Move focus after calling openPreferences for a sub-category. Temporary fix until mozilla bug 1799153 gets a patch upstream. - - - - - 9fdb1fb1 by Pier Angelo Vendrame at 2022-12-09T12:47:03+01:00 Bug 41116: Normalize system fonts. System fonts are an enormous fingerprinting vector. Even with font allow lists and with our custom configuration on Linux, which counter metrics measurements, getComputedStyle leaks several details. This patch counters both these kinds of attacks. - - - - - bc6864d5 by Pier Angelo Vendrame at 2022-12-09T12:47:03+01:00 Tweaks to the build system Bug 40857: Modified the fat .aar creation file This is a workaround to build fat .aars with the compiling enviornment disabled. Mozilla does not use a similar configuration, but either runs a Firefox build and discards its output, or uses artifacts build. We might switch to artifact builds too, and drop this patch, or write a better one to upstream. But until then we need this patch. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1763770. Bug 41458: Prevent `mach package-multi-locale` from actually creating a package macOS builds need some files to be moved around with ./mach package-multi-locale to create multi-locale packages. The required command isn't exposed through any other mach command. So, we patch package-multi-locale both to prevent it from failing when doing official builds and to detect any future changes on it. - - - - - 99d96677 by Dan Ballard at 2022-12-09T12:47:04+01:00 Bug 41117: using MOZ_PROXY_BYPASS_PROTECTION disable share menu on mac and windows, and restpre email link on mac - - - - - bdc67678 by Gaba at 2022-12-09T12:47:04+01:00 Adding issue template for bugs. - - - - - bdf5e0ee by Pier Angelo Vendrame at 2022-12-09T12:47:05+01:00 Base Browser's .mozconfigs. - - - - - 1c547bae by Pier Angelo Vendrame at 2022-12-09T12:47:05+01:00 Bug 41108: Remove privileged macOS installation from 102 - - - - - 5af007ef by Dan Ballard at 2022-12-09T12:47:06+01:00 Bug 41149: Re-enable DLL injection protection in all builds not just nightlies - - - - - ba175aeb by Matthew Finkel at 2022-12-09T12:47:06+01:00 Bug 24796: Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. - - - - - 42b18efc by Matthew Finkel at 2022-12-09T12:47:06+01:00 Bug 25741: TBA: Disable GeckoNetworkManager The browser should not need information related to the network interface or network state, tor should take care of that. - - - - - 301dd582 by Matthew Finkel at 2022-12-09T12:47:07+01:00 Bug 28125: Prevent non-Necko network connections - - - - - cb7c318d by Mike Perry at 2022-12-09T12:47:07+01:00 Bug 12974: Disable NTLM and Negotiate HTTP Auth The Mozilla bugs: https://bugzilla.mozilla.org/show_bug.cgi?id=1046421, https://bugzilla.mozilla.org/show_bug.cgi?id=1261591, tor-browser#27602 - - - - - 2096a7c2 by Alex Catarineu at 2022-12-09T12:47:08+01:00 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1768899 - - - - - fc0e1f62 by Georg Koppen at 2022-12-09T12:47:08+01:00 Bug 16285: Exclude ClearKey system for now In the past the ClearKey system had not been compiled when specifying --disable-eme. But that changed and it is even bundled nowadays (see: Mozilla's bug 1300654). We don't want to ship it right now as the use case for it is not really visible while the code had security vulnerabilities in the past. - - - - - 3acb261c by Kathy Brade at 2022-12-09T12:47:09+01:00 Bug 21431: Clean-up system extensions shipped in Firefox Only ship the pdfjs extension. - - - - - 33869162 by Kathy Brade at 2022-12-09T12:47:09+01:00 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. Hide elements on about:logins that mention sync, "Firefox LockWise", and Mozilla's LockWise mobile apps. Disable the "Create New Login" button when security.nocertdb is true. - - - - - 656bb482 by Alex Catarineu at 2022-12-09T12:47:10+01:00 Bug 41457: Remove Mozilla permissions Bug 40025: Remove Mozilla add-on install permissions - - - - - 21bd3448 by Kathy Brade at 2022-12-09T12:47:10+01:00 Bug 40002: Remove about:ion Firefox Ion (previously Firefox Pioneer) is an opt-in program in which people volunteer to participate in studies that collect detailed, sensitive data about how they use their browser. - - - - - 1a66a537 by Arthur Edelstein at 2022-12-09T12:47:11+01:00 Bug 26353: Prevent speculative connect that violated FPI. Connections were observed in the catch-all circuit when the user entered an https or http URL in the URL bar, or typed a search term. - - - - - 7a45a690 by Alex Catarineu at 2022-12-09T12:47:11+01:00 Bug 31740: Remove some unnecessary RemoteSettings instances More concretely, SearchService.jsm 'hijack-blocklists' and url-classifier-skip-urls. Avoid creating instance for 'anti-tracking-url-decoration'. If prefs are disabling their usage, avoid creating instances for 'cert-revocations' and 'intermediates'. Do not ship JSON dumps for collections we do not expect to need. For the ones in the 'main' bucket, this prevents them from being synced unnecessarily (the code in remote-settings does so for collections in the main bucket for which a dump or local data exists). For the collections in the other buckets, we just save some size by not shipping their dumps. We also clear the collections database on the v2 -> v3 migration. - - - - - c97b6977 by Georg Koppen at 2022-12-09T12:47:12+01:00 Bug 30541: Disable WebGL readPixel() for web content Related Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1428034 - - - - - 681466cd by Alex Catarineu at 2022-12-09T12:47:12+01:00 Bug 28369: Stop shipping pingsender executable - - - - - 771dd9df by Alex Catarineu at 2022-12-09T12:47:12+01:00 Bug 40073: Disable remote Public Suffix List fetching In https://bugzilla.mozilla.org/show_bug.cgi?id=1563246 Firefox implemented fetching the Public Suffix List via RemoteSettings and replacing the default one at runtime, which we do not want. - - - - - d03ee771 by Mike Perry at 2022-12-09T12:47:13+01:00 Firefox preference overrides. This hack directly includes our preference changes in omni.ja. Bug 18292: Staged updates fail on Windows Temporarily disable staged updates on Windows. Bug 18297: Use separate Noto JP,KR,SC,TC fonts Bug 23404: Add Noto Sans Buginese to the macOS whitelist Bug 23745: Set dom.indexedDB.enabled = true Bug 13575: Disable randomised Firefox HTTP cache decay user tests. (Fernando Fernandez Mancera <ffmancera(a)riseup.net>) Bug 17252: Enable session identifiers with FPI Session tickets and session identifiers were isolated by OriginAttributes, so we can re-enable them by allowing the default value (true) of "security.ssl.disable_session_identifiers". The pref "security.enable_tls_session_tickets" is obsolete (removed in https://bugzilla.mozilla.org/917049) Bug 14952: Enable http/2 and AltSvc In Firefox, SPDY/HTTP2 now uses Origin Attributes for isolation of connections, push streams, origin frames, etc. That means we get first-party isolation provided "privacy.firstparty.isolate" is true. So in this patch, we stop overriding "network.http.spdy.enabled" and "network.http.spdy.enabled.http2". Alternate Services also use Origin Attributes for isolation. So we stop overriding "network.http.altsvc.enabled" and "network.http.altsvc.oe" as well. (All 4 of the abovementioned "network.http.*" prefs adopt Firefox 60ESR's default value of true.) However, we want to disable HTTP/2 push for now, so we set "network.http.spdy.allow-push" to false. "network.http.spdy.enabled.http2draft" was removed in Bug 1132357. "network.http.sped.enabled.v2" was removed in Bug 912550. "network.http.sped.enabled.v3" was removed in Bug 1097944. "network.http.sped.enabled.v3-1" was removed in Bug 1248197. Bug 26114: addons.mozilla.org is not special * Don't expose navigator.mozAddonManager on any site * Don't block NoScript from modifying addons.mozilla.org or other sites Enable ReaderView mode again (#27281). Bug 29916: Make sure enterprise policies are disabled Bug 2874: Block Components.interfaces from content Bug 26146: Spoof HTTP User-Agent header for desktop platforms In Tor Browser 8.0, the OS was revealed in both the HTTP User-Agent header and to JavaScript code via navigator.userAgent. To avoid leaking the OS inside each HTTP request (which many web servers log), always use the Windows 7 OS value in the desktop User-Agent header. We continue to allow access to the actual OS via JavaScript, since doing so improves compatibility with web applications such as GitHub and Google Docs. Bug 12885: Windows Jump Lists fail for Tor Browser Jumplist entries are stored in a binary file in: %APPDATA%\\Microsoft\Windows\Recent\CustomDestinations\ and has a name in the form [a-f0-9]+.customDestinations-ms The hex at the front is unique per app, and is ultimately derived from something called the 'App User Model ID' (AUMID) via some unknown hashing method. The AUMID is provided as a key when programmatically creating, updating, and deleting a jumplist. The default behaviour in firefox is for the installer to define an AUMID for an app, and save it in the registry so that the jumplist data can be removed by the uninstaller. However, the Tor Browser does not set this (or any other) regkey during installation, so this codepath fails and the app's AUMID is left undefined. As a result the app's AUMID ends up being defined by windows, but unknowable by Tor Browser. This unknown AUMID is used to create and modify the jumplist, but the delete API requires that we provide the app's AUMID explicitly. Since we don't know what the AUMID is (since the expected regkey where it is normally stored does not exist) jumplist deletion will fail and we will leave behind a mostly empty customDestinations-ms file. The name of the file is derived from the binary path, so an enterprising person could reverse engineer how that hex name is calculated, and generate the name for Tor Browser's default Desktop installation path to determine whether a person had used Tor Browser in the past. The 'taskbar.grouping.useprofile' option that is enabled by this patch works around this AUMID problem by having firefox.exe create it's own AUMID based on the profile path (rather than looking for a regkey). This way, if a user goes in and enables and disables jumplist entries, the backing store is properly deleted. Unfortunately, all windows users currently have this file lurking in the above mentioned directory and this patch will not remove it since it was created with an unknown AUMID. However, another patch could be written which goes to that directory and deletes any item containing the 'Tor Browser' string. See bug 28996. Bug 30845: Make sure default themes and other internal extensions are enabled Bug 28896: Enable extensions in private browsing by default Bug 31065: Explicitly allow proxying localhost Bug 31598: Enable letterboxing Disable Presentation API everywhere Bug 21549 - Use Firefox's WASM default pref. It is disabled at safer security levels. Bug 32321: Disable Mozilla's MitM pings Bug 19890: Disable installation of system addons By setting the URL to "" we make sure that already installed system addons get deleted as well. Bug 22548: Firefox downgrades VP9 videos to VP8. On systems where H.264 is not available or no HWA, VP9 is preferred. But in Tor Browser 7.0 all youtube videos are degraded to VP8. This behaviour can be turned off by setting media.benchmark.vp9.threshold to 0. All clients will get better experience and lower traffic, beause TBB doesn't use "Use hardware acceleration when available". Bug 25741 - TBA: Add mobile-override of 000-tor-browser prefs Bug 16441: Suppress "Reset Tor Browser" prompt. Bug 29120: Use the in-memory media cache and increase its maximum size. Bug 33697: use old search config based on list.json Bug 33855: Ensure that site-specific browser mode is disabled. Bug 30682: Disable Intermediate CA Preloading. Bug 40061: Omit the Windows default browser agent from the build Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40408: Disallow SVG Context Paint in all web content Bug 40308: Disable network partitioning until we evaluate dFPI Bug 40322: Consider disabling network.connectivity-service.enabled Bug 40383: Disable dom.enable_event_timing Bug 40423: Disable http/3 Bug 40177: Update prefs for Fx91esr Bug 40700: Disable addons and features recommendations Bug 40682: Disable network.proxy.allow_bypass Bug 40736: Disable third-party cookies in PBM Bug 19850: Enabled HTTPS-Only by default Bug 40912: Hide the screenshot menu Bug 41292: Disable moreFromMozilla in preferences page Bug 40057: Ensure the CSS4 system colors are not a fingerprinting vector Bug 24686: Set network.http.tailing.enabled to true Bug 40183: Disable TLS ciphersuites using SHA-1 Bug 40783: Review 000-tor-browser.js and 001-base-profile.js for 102 We reviewed all the preferences we set for 102, and remove a few old ones. See the description of that issue to see all the preferences we believed were still valid for 102, and some brief description for the reasons to keep them. - - - - - baa5d166 by Pier Angelo Vendrame at 2022-12-09T12:47:13+01:00 Bug 41043: Hardcode the UI font on Linux The mechanism to choose the UI font does not play well with our fontconfig configuration. As a result, the final criterion to choose the font for the UI was its version. Since we hardcode Arimo as a default sans-serif on preferences, we use it also for the UI. FontConfig will fall back to some other font for scripts Arimo does not cover as expected (we tested with Japanese). - - - - - e57cc939 by Alex Catarineu at 2022-12-09T12:47:14+01:00 Bug 30605: Honor privacy.spoof_english in Android This checks `privacy.spoof_english` whenever `setLocales` is called from Fenix side and sets `intl.accept_languages` accordingly. Bug 40198: Expose privacy.spoof_english pref in GeckoView - - - - - 7a9c7653 by Alex Catarineu at 2022-12-09T12:47:14+01:00 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView - - - - - add753b6 by Alex Catarineu at 2022-12-09T12:47:15+01:00 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware - - - - - 52611f3d by Alex Catarineu at 2022-12-09T12:47:15+01:00 Bug 26345: Hide tracking protection UI - - - - - 0d9069de by Kathy Brade at 2022-12-09T12:47:16+01:00 Bug 9173: Change the default Firefox profile directory to be relative. This should eliminate our need to rely on a wrapper script that sets /Users/arthur and launches Firefox with -profile. - - - - - 32988ddc by Kathy Brade at 2022-12-09T12:47:16+01:00 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp Instead of using the local computer's IP address within symlink-based profile lock signatures, always use 127.0.0.1. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1769028 - - - - - c9fb214b by Alex Catarineu at 2022-12-09T12:47:17+01:00 Bug 27604: Fix addon issues when moving the profile directory Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1429838 - - - - - 45c7a08f by Mike Perry at 2022-12-09T12:47:17+01:00 Bug 13028: Prevent potential proxy bypass cases. It looks like these cases should only be invoked in the NSS command line tools, and not the browser, but I decided to patch them anyway because there literally is a maze of network function pointers being passed around, and it's very hard to tell if some random code might not pass in the proper proxied versions of the networking code here by accident. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1433509 - - - - - 6b3ee7fd by Kathy Brade at 2022-12-09T12:47:18+01:00 Bug 11641: Disable remoting by default. Unless the -osint command line flag is used, the browser now defaults to the equivalent of -no-remote. There is a new -allow-remote flag that may be used to restore the original (Firefox-like) default behavior. - - - - - 33277907 by Igor Oliveira at 2022-12-09T12:47:18+01:00 Bug 23104: Add a default line height compensation Many fonts have issues with their vertical metrics. they are used to influence the height of ascenders and depth of descenders. Gecko uses it to calculate the line height (font height + ascender + descender), however because of that idiosyncratic behavior across multiple operating systems, it can be used to identify the user's OS. The solution proposed in the patch uses a default factor to be multiplied with the font size, simulating the concept of ascender and descender. This way all operating systems will have the same line height only and only if the frame is outside the chrome. - - - - - 1c1a67ef by Pier Angelo Vendrame at 2022-12-09T12:47:18+01:00 Bug 40309: Avoid using regional OS locales Avoid regional OS locales if the pref `intl.regional_prefs.use_os_locales` is false but RFP is enabled. - - - - - 135eb036 by Matthew Finkel at 2022-12-09T12:47:19+01:00 Bug 40432: Prevent probing installed applications Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1711084 - - - - - ab6f6e86 by hackademix at 2022-12-09T12:47:19+01:00 Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to mitigate race conditions on newly created windows and tabs. - - - - - 906f8dca by hackademix at 2022-12-09T12:47:20+01:00 Bug 41434: Letterboxing, improve logging. - - - - - 6606bb8e by hackademix at 2022-12-09T12:47:20+01:00 Bug 31064: Letterboxing, exempt browser extensions. - - - - - f3cbba4e by hackademix at 2022-12-09T12:47:21+01:00 Bug 32411: Letterboxing, exempt view-source: URIs. - - - - - 8affcce7 by Richard Pospesel at 2022-12-09T12:47:21+01:00 Bug 32220: Improve the letterboxing experience CSS and JS changes to alter the UX surrounding letterboxing. The browser element containing page content is now anchored to the bottom of the toolbar, and the remaining letterbox margin is the same color as the firefox chrome. The letterbox margin and outline are tied to the currently selected theme. Bugzilla: https://bugzilla.mozilla.org/show_bug.cgi?id=1594455 - - - - - 088bb96b by Alex Catarineu at 2022-12-09T12:47:22+01:00 Bug 40069: Add helpers for message passing with extensions - - - - - fb5b5683 by Matthew Finkel at 2022-12-09T12:47:22+01:00 Bug 40253: Explicitly allow NoScript in Private Browsing mode. - - - - - 0bf39c39 by Pier Angelo Vendrame at 2022-12-09T12:47:23+01:00 Bug 41369: Improve Firefox language settings for multi-lingual packages Change the language selector to be sorted by language code, rather than name, and to display the language code to the user. Bug 41372: Handle Japanese as a special case in preferences on macOS Japanese is treated in a special way on macOS. However, seeing the Japanese language tag could be confusing for users, and moreover the language name is not localized correctly like other langs. Bug 41378: Tell users that they can change their language at the first start With multi-lingual builds, Tor Browser matches the user's system language, but some users might want to change it. So, we tell them that it is possible, but only once. - - - - - 72248ce8 by Henry Wilkes at 2022-12-09T12:47:23+01:00 Bug 41371: Temporary hack to fix language selector popup position - - - - - 7d7c220f by Pier Angelo Vendrame at 2022-12-09T12:47:24+01:00 Bug 41417: Always prompt users to restart after changing language This is a temporary patch that we need until we switch our strings to Fluent. The reason is that we currently set strings when we populate our XUL content. We could rework the whole mechanism, but it is not worth it because we want to switch to Fluent, which will handle everything automatically. - - - - - bfe4c248 by Pier Angelo Vendrame at 2022-12-09T12:47:24+01:00 Bug 40925: Implemented the Security Level component This component adds a new Security Level toolbar button which visually indicates the current global security level via icon (as defined by the extensions.torbutton.security_slider pref), a drop-down hanger with a short description of the current security level, and a new section in the about:preferences#privacy page where users can change their current security level. In addition, the hanger and the preferences page will show a visual warning when the user has modified prefs associated with the security level and provide a one-click 'Restore Defaults' button to get the user back on recommended settings. Bug 40125: Expose Security Level pref in GeckoView - - - - - bc629c0c by Pier Angelo Vendrame at 2022-12-09T12:47:25+01:00 Bug 40926: Implemented the New Identity feature - - - - - 7cb091bc by Richard Pospesel at 2022-12-09T12:56:08+01:00 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser - - - - - 77d59089 by Mike Perry at 2022-12-09T12:56:09+01:00 Bug 2176: Rebrand Firefox to TorBrowser See also Bugs #5194, #7187, #8115, #8219. This patch does some basic renaming of Firefox to TorBrowser. The rest of the branding is done by images and icons. Also fix bug 27905. Bug 25702: Update Tor Browser icon to follow design guidelines - Updated all of the branding in /browser/branding/official with new 'stable' icon series. - Updated /extensions/onboarding/content/img/tor-watermark.png with new icon and add the source svg in the same directory - Copied /browser/branding/official over /browser/branding/nightly and the new /browser/branding/alpha directories. Replaced content with 'nightly' and 'alpha' icon series. Updated VisualElements_70.png and VisualElements_150.png with updated icons in each branding directory (fixes #22654) - Updated firefox.VisualElementsManfiest.xml with updated colors in each branding directory - Added firefox.svg to each branding directory from which all the other icons are derived (apart from document.icns and document.ico) - Added default256.png and default512.png icons - Updated aboutTBUpdate.css to point to branding-aware icon128.png and removed original icon - Use the Tor Browser icon within devtools/client/themes/images/. Bug 30631: Blurry Tor Browser icon on macOS app switcher It would seem the png2icns tool does not generate correct icns files and so on macOS the larger icons were missing resulting in blurry icons in the OS chrome. Regenerated the padded icons in a macOS VM using iconutil. Bug 28196: preparations for using torbutton tor-browser-brand.ftl A small change to Fluent FileSource class is required so that we can register a new source without its supported locales being counted as available locales for the browser. Bug 31803: Replaced about:debugging logo with flat version Bug 21724: Make Firefox and Tor Browser distinct macOS apps When macOS opens a document or selects a default browser, it sometimes uses the CFBundleSignature. Changing from the Firefox MOZB signature to a different signature TORB allows macOS to distinguish between Firefox and Tor Browser. Bug 32092: Fix Tor Browser Support link in preferences For bug 40562, we moved onionPattern* from bug 27476 to here, as about:tor needs these files but it is included earlier. Bug 41278: Create Tor Browser styled pdf logo similar to the vanilla Firefox one - - - - - 6d1a6bf3 by Alex Catarineu at 2022-12-09T12:56:09+01:00 Bring back old Firefox onboarding Revert "Bug 1462415 - Delete onboarding system add-on r=Standard8,k88hudson" This reverts commit f7ffd78b62541d44d0102f8051d2f4080bdbc432. Revert "Bug 1498378 - Actually remove the old onboarding add-on's prefs r=Gijs" This reverts commit 057fe36fc6f3e93e265505c7dcc703a0941778e2. Bug 28822: Convert onboarding to webextension Partially revert 1564367 (controlCenter in UITour.jsm) - - - - - 8a186e8a by Kathy Brade at 2022-12-09T12:56:10+01:00 Bug 26961: New user onboarding. Reuse the Firefox onboarding mechanism with minimal changes. Localizable strings are pulled in from Torbutton (if Torbutton is not installed, we lack about:tor and no tour will be shown). Replace SVG images with PNGs (see bug 27002), For defense in depth, omit include OnboardingTelemetry.jsm entirely. Added support for the following UITour page event: torBrowserOpenSecuritySettings Also fix bug 27403: the onboarding bubble is not always displayed. Arthur suggested to make the onboarding bubble visible on displays with less than 960px width available, so we choose 200px instead. Also fix bug 28628: Change onboarding Security panel to open new Security Level panel. Also fix bug 27484: Improve navigation within onboarding. Bug 27082: enable a limited UITour Disallow access to UITour functionality from all pages other than about:home, about:newtab, and about:tor. Implement a whitelist mechanism for page actions. Bug 26962 - implement new features onboarding (part 1). Add an "Explore" button to the "Circuit Display" panel within new user onboarding which opens the DuckDuckGo .onion and then guides users through a short circuit display tutorial. Allow a few additional UITour actions while limiting as much as possible how it can be used. Tweak the UITour styles to match the Tor Browser branding. All user interface strings are retrieved from Torbutton's browserOnboarding.properties file. Bug 27486 Avoid about:blank tabs when opening onboarding pages. Instead of using a simple <a href>, programmatically open onboarding web pages by using tabBrowser.addTab(). The same technique is now used for "See My Path", "See FAQs", and "Visit an Onion". Bug 29768: Introduce new features to users Add an "update" tour for the Tor Browser 8.5 release that contains two panels: Toolbar and Security (with appropriate description text and images). Display an attention-grabbing dot on the onboarding text bubble when the update tour is active. The animation lasts for 14 seconds. Bug 31768: Introduce toolbar and network settings changes in onboarding Update the "Tor Network" onboarding page to include a note that settings can now be accessed via the application preferences and add an "Adjust Your Tor Network Settings" action button which opens about:preferences#tor. Replace the Tor Browser 8.5 "update" onboarding tour with a 9.0 one that includes the revised "Tor Network" page and a revised "Toolbar" page. The latter explains that Torbutton's toolbar item has been removed ("Goodbye Onion Button") and explains how to access the New Identity feature using the hamburger menu and new toolbar item. Bug 34321 - Add Learn More onboarding item Bug 40429: Update Onboarding for 10.5 - - - - - e43e8e23 by Mike Perry at 2022-12-09T12:56:10+01:00 TB3: Tor Browser's official .mozconfigs. Also: Bug #9829.1: new .mozconfig file for the new cross-compiler and ESR24 Changes needed to build Mac in 64bit Bug 10715: Enable Webgl for mingw-w64 again. Disable ICU when cross-compiling; clean-up. Bug 15773: Enable ICU on OS X Bug 15990: Don't build the sandbox with mingw-w64 Bug 12761: Switch to ESR 38 for OS X Updating .mozconfig-asan Bug 12516: Compile hardenend Tor Browser with -fwrapv Bug 18331: Switch to Mozilla's toolchain for building Tor Browser for OS X Bug 17858: Cannot create incremental MARs for hardened builds. Define HOST_CFLAGS, etc. to avoid compiling programs such as mbsdiff (which is part of mar-tools and is not distributed to end-users) with ASan. Bug 13419: Add back ICU for Windows Bug 21239: Use GTK2 for ESR52 Linux builds Bug 23025: Add hardening flags for macOS Bug 24478: Enable debug assertions and tests in our ASan builds --enable-proxy-bypass-protection Bug 27597: ASan build option in tor-browser-build is broken Bug 27623 - Export MOZILLA_OFFICIAL during desktop builds This fixes a problem where some preferences had the wrong default value. Also see bug 27472 where we made a similar fix for Android. Bug 30463: Explicitly disable MOZ_TELEMETRY_REPORTING Bug 31450: Set proper BINDGEN_CFLAGS for ASan builds Add an --enable-tor-browser-data-outside-app-dir configure option Add --with-tor-browser-version configure option Bug 21849: Don't allow SSL key logging. Bug 31457: disable per-installation profiles The dedicated profiles (per-installation) feature does not interact well with our bundled profiles on Linux and Windows, and it also causes multiple profiles to be created on macOS under TorBrowser-Data. Bug 31935: Disable profile downgrade protection. Since Tor Browser does not support more than one profile, disable the prompt and associated code that offers to create one when a version downgrade situation is detected. Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT Bug 25741 - TBA: Disable features at compile-time MOZ_NATIVE_DEVICES for casting and the media player MOZ_TELEMETRY_REPORTING for telemetry MOZ_DATA_REPORTING for all data reporting preferences (crashreport, telemetry, geo) Bug 25741 - TBA: Add default configure options in dedicated file Define MOZ_ANDROID_NETWORK_STATE and MOZ_ANDROID_LOCATION Bug 29859: Disable HLS support for now Add --disable-tor-launcher build option Add --enable-tor-browser-update build option Bug 33734: Set MOZ_NORMANDY to False Bug 33851: Omit Parental Controls. Bug 40061: Omit the Windows default browser agent from the build Bug 40107: Adapt .mozconfig-asan for ESR 78 Bug 40252: Add --enable-rust-simd to our tor-browser mozconfig files Bug 40793: moved Tor configuration options from old-configure.in to moz.configure - - - - - b65ed34b by Henry Wilkes at 2022-12-09T12:56:11+01:00 Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds tor-browser#41285: Enable fluent warnings. - - - - - 882c2526 by Pier Angelo Vendrame at 2022-12-09T12:56:11+01:00 Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Before reordering patches, we used to keep the Tor-related patches (torbutton and tor-launcher) at the beginning. After that issue, we decided to move them towards the end. In addition to that, we have decided to move Tor Browser-only preferences there, too, to make Base Browser-only fixups easier to apply. - - - - - 54137f29 by Kathy Brade at 2022-12-09T12:56:12+01:00 Bug 13252: Do not store data in the app bundle When --enable-tor-browser-data-outside-app-dir is enabled, all user data is stored in a directory named TorBrowser-Data which is located next to the application directory. Display an informative error message if the TorBrowser-Data directory cannot be created due to an "access denied" or a "read only volume" error. On Mac OS, add support for the --invisible command line option which is used by the meek-http-helper to avoid showing an icon for the helper browser on the dock. - - - - - ffe147fb by Pier Angelo Vendrame at 2022-12-09T12:56:12+01:00 Bug 40933: Add tor-launcher functionality - - - - - 5d82e763 by Richard Pospesel at 2022-12-09T12:56:13+01:00 Bug 40597: Implement TorSettings module - migrated in-page settings read/write implementation from about:preferences#tor to the TorSettings module - TorSettings initially loads settings from the tor daemon, and saves them to firefox prefs - TorSettings notifies observers when a setting has changed; currently only QuickStart notification is implemented for parity with previous preference notify logic in about:torconnect and about:preferences#tor - about:preferences#tor, and about:torconnect now read and write settings thorugh the TorSettings module - all tor settings live in the torbrowser.settings.* preference branch - removed unused pref modify permission for about:torconnect content page from AsyncPrefs.jsm Bug 40645: Migrate Moat APIs to Moat.jsm module - - - - - ca9cee65 by Alex Catarineu at 2022-12-09T15:40:01+01:00 Bug 10760: Integrate TorButton to TorBrowser core Because of the non-restartless nature of Torbutton, it required a two-stage installation process. On mobile, it was a problem, because it was not loading when the user opened the browser for the first time. Moving it to tor-browser and making it a system extension allows it to load when the user opens the browser for first time. Additionally, this patch also fixes Bug 27611. Bug 26321: New Circuit and New Identity menu items Bug 14392: Make about:tor behave like other initial pages. Bug 25013: Add torbutton as a tor-browser submodule Bug 31575: Replace Firefox Home (newtab) with about:tor Avoid loading AboutNewTab in BrowserGlue.jsm in order to avoid several network requests that we do not need. Besides, about:newtab will now point to about:blank or about:tor (depending on browser.newtabpage.enabled) and about:home will point to about:tor. - - - - - 33856857 by Amogh Pradeep at 2022-12-09T15:40:07+01:00 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. See Bug 1357997 for partial uplift. Also: Bug 28051 - Use our Orbot for proxying our connections Bug 31144 - ESR68 Network Code Review - - - - - 9f79ef3d by Alex Catarineu at 2022-12-09T15:40:07+01:00 Add TorStrings module for localization - - - - - 5ca08c8e by Kathy Brade at 2022-12-09T15:40:08+01:00 Bug 14631: Improve profile access error messages. Instead of always reporting that the profile is locked, display specific messages for "access denied" and "read-only file system". To allow for localization, get profile-related error strings from Torbutton. Use app display name ("Tor Browser") in profile-related error alerts. - - - - - 0c7c46f8 by sanketh at 2022-12-09T15:40:08+01:00 Bug 40209: Implement Basic Crypto Safety Adds a CryptoSafety actor which detects when you've copied a crypto address from a HTTP webpage and shows a warning. Closes #40209. Bug 40428: Fix string attribute names - - - - - b46b9f27 by Kathy Brade at 2022-12-09T15:40:09+01:00 Bug 19273: Avoid JavaScript patching of the external app helper dialog. When handling an external URI or downloading a file, invoke Torbutton's external app blocker component (which will present a download warning dialog unless the user has checked the "Automatically download files from now on" box). For e10s compatibility, avoid using a modal dialog and instead use a callback interface (nsIHelperAppWarningLauncher) to allow Torbutton to indicate the user's desire to cancel or continue each request. Other bugs fixed: Bug 21766: Crash with e10s enabled while trying to download a file Bug 21886: Download is stalled in non-e10s mode Bug 22471: Downloading files via the PDF viewer download button is broken Bug 22472: Fix FTP downloads when external helper app dialog is shown Bug 22610: Avoid crashes when canceling external helper app downloads Bug 22618: Downloading pdf file via file:/// is stalling - - - - - 2ad18d1c by Pier Angelo Vendrame at 2022-12-09T15:40:09+01:00 Bug 40807: Added QRCode.js to toolkit/modules - - - - - fb54164c by Richard Pospesel at 2022-12-09T15:40:09+01:00 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection This patch adds a new about:preferences#connection page which allows modifying bridge, proxy, and firewall settings from within Tor Browser. All of the functionality present in tor-launcher's Network Configuration panel is present: - Setting built-in bridges - Requesting bridges from BridgeDB via moat - Using user-provided bridges - Configuring SOCKS4, SOCKS5, and HTTP/HTTPS proxies - Setting firewall ports - Viewing and Copying Tor's logs - The Networking Settings in General preferences has been removed Bug 40774: Update about:preferences page to match new UI designs - - - - - b7df8f23 by Richard Pospesel at 2022-12-09T15:40:10+01:00 Bug 27476: Implement about:torconnect captive portal within Tor Browser - implements new about:torconnect page as tor-launcher replacement - adds tor connection status to url bar and tweaks UX when not online - adds new torconnect component to browser - tor process management functionality remains implemented in tor-launcher through the TorProtocolService module - adds warning/error box to about:preferences#tor when not connected to tor - explicitly allows about:torconnect URIs to ignore Resist Fingerprinting (RFP) - various tweaks to info-pages.inc.css for about:torconnect (also affects other firefox info pages) Bug 40773: Update the about:torconnect frontend page to match additional UI flows - - - - - 4d0feeb0 by Arthur Edelstein at 2022-12-09T15:40:10+01:00 Bug 12620: TorBrowser regression tests Regression tests for Bug #2950: Make Permissions Manager memory-only Regression tests for TB4: Tor Browser's Firefox preference overrides. Note: many more functional tests could be made here Regression tests for #2874: Block Components.interfaces from content Bug 18923: Add a script to run all Tor Browser specific tests Regression tests for Bug #16441: Suppress "Reset Tor Browser" prompt. - - - - - 6ebd3c35 by Kathy Brade at 2022-12-09T15:40:11+01:00 Bug 4234: Use the Firefox Update Process for Tor Browser. The following files are never updated: TorBrowser/Data/Browser/profiles.ini TorBrowser/Data/Browser/profile.default/bookmarks.html TorBrowser/Data/Tor/torrc Mac OS: Store update metadata under TorBrowser/UpdateInfo. Removed the %OS_VERSION% component from the update URL (13047) and added support for minSupportedOSVersion, an attribute of the <update> element that may be used to trigger Firefox's "unsupported platform" behavior. Hide the "What's new" links (set app.releaseNotesURL value to about:blank). Windows: disable "runas" code path in updater (15201). Windows: avoid writing to the registry (16236). Also includes fixes for tickets 13047, 13301, 13356, 13594, 15406, 16014, 16909, 24476, and 25909. Also fix Bug 26049: reduce the delay before the update prompt is displayed. Instead of Firefox's 2 days, we use 1 hour (after which time the update doorhanger will be displayed). Also fix bug 27221: purge the startup cache if the Tor Browser version changed (even if the Firefox version and build ID did not change), e.g., after a minor Tor Browser update. Also fix 32616: Disable GetSecureOutputDirectoryPath() functionality. Bug 26048: potentially confusing "restart to update" message Within the update doorhanger, remove the misleading message that mentions that windows will be restored after an update is applied, and replace the "Restart and Restore" button label with an existing "Restart to update Tor Browser" string. Bug 28885: notify users that update is downloading Add a "Downloading Tor Browser update" item which appears in the hamburger (app) menu while the update service is downloading a MAR file. Before this change, the browser did not indicate to the user that an update was in progress, which is especially confusing in Tor Browser because downloads often take some time. If the user clicks on the new menu item, the about dialog is opened to allow the user to see download progress. As part of this fix, the update service was changed to always show update-related messages in the hamburger menu, even if the update was started in the foreground via the about dialog or via the "Check for Tor Browser Update" toolbar menu item. This change is consistent with the Tor Browser goal of making sure users are informed about the update process. Removed #28885 parts of this patch which have been uplifted to Firefox. - - - - - 425758ac by Kathy Brade at 2022-12-09T15:40:11+01:00 Bug 13379: Sign our MAR files. Configure with --enable-verify-mar (when updating, require a valid signature on the MAR file before it is applied). Use the Tor Browser version instead of the Firefox version inside the MAR file info block (necessary to prevent downgrade attacks). Use NSS on all platforms for checking MAR signatures (instead of using OS-native APIs, which Mozilla does on Mac OS and Windows). So that the NSS and NSPR libraries the updater depends on can be found at runtime, we add the firefox directory to the shared library search path on macOS. On Linux, rpath is used by Mozilla to solve that problem, but that approach won't work on macOS because the updater executable is copied during the update process to a location that is under TorBrowser-Data, and the location of TorBrowser-Data varies. Also includes the fix for bug 18900. Bug 19121: reinstate the update.xml hash check Revert most changes from Mozilla Bug 1373267 "Remove hashFunction and hashValue attributes from nsIUpdatePatch and code related to these attributes." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. Also partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. We kept the addition to the AppConstants API in case other JS code references it in the future. - - - - - e526a0a7 by Kathy Brade at 2022-12-09T15:40:12+01:00 Bug 16940: After update, load local change notes. Add an about:tbupdate page that displays the first section from TorBrowser/Docs/ChangeLog.txt and includes a link to the remote post-update page (typically our blog entry for the release). Always load about:tbupdate in a content process, but implement the code that reads the file system (changelog) in the chrome process for compatibility with future sandboxing efforts. Also fix bug 29440. Now about:tbupdate is styled as a fairly simple changelog page that is designed to be displayed via a link that is on about:tor. - - - - - 56b66a8d by Georg Koppen at 2022-12-09T15:40:12+01:00 Bug 32658: Create a new MAR signing key It's time for our rotation again: Move the backup key in the front position and add a new backup key. Bug 33803: Move our primary nightly MAR signing key to tor-browser Bug 33803: Add a secondary nightly MAR signing key - - - - - 0741e2bd by Mike Perry at 2022-12-09T15:40:13+01:00 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing eBay and Amazon don't treat Tor users very well. Accounts often get locked and payments reversed. Also: Bug 16322: Update DuckDuckGo search engine We are replacing the clearnet URL with an onion service one (thanks to a patch by a cypherpunk) and are removing the duplicated DDG search engine. Duplicating DDG happend due to bug 1061736 where Mozilla included DDG itself into Firefox. Interestingly, this caused breaking the DDG search if JavaScript is disabled as the Mozilla engine, which gets loaded earlier, does not use the html version of the search page. Moreover, the Mozilla engine tracked where the users were searching from by adding a respective parameter to the search query. We got rid of that feature as well. Also: This fixes bug 20809: the DuckDuckGo team has changed its server-side code in a way that lets users with JavaScript enabled use the default landing page while those without JavaScript available get redirected directly to the non-JS page. We adapt the search engine URLs accordingly. Also fixes bug 29798 by making sure we only specify the Google search engine we actually ship an .xml file for. Also regression tests. squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40494: Update Startpage search provider squash! Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing Bug 40438: Add Blockchair as a search engine Bug 33342: Avoid disconnect search addon error after removal. We removed the addon in #32767, but it was still being loaded from addonStartup.json.lz4 and throwing an error on startup because its resource: location is not available anymore. - - - - - a547746e by Richard Pospesel at 2022-12-09T15:40:13+01:00 Bug 23247: Communicating security expectations for .onion Encrypting pages hosted on Onion Services with SSL/TLS is redundant (in terms of hiding content) as all traffic within the Tor network is already fully encrypted. Therefore, serving HTTP pages from an Onion Service is more or less fine. Prior to this patch, Tor Browser would mostly treat pages delivered via Onion Services as well as pages delivered in the ordinary fashion over the internet in the same way. This created some inconsistencies in behaviour and misinformation presented to the user relating to the security of pages delivered via Onion Services: - HTTP Onion Service pages did not have any 'lock' icon indicating the site was secure - HTTP Onion Service pages would be marked as unencrypted in the Page Info screen - Mixed-mode content restrictions did not apply to HTTP Onion Service pages embedding Non-Onion HTTP content This patch fixes the above issues, and also adds several new 'Onion' icons to the mix to indicate all of the various permutations of Onion Services hosted HTTP or HTTPS pages with HTTP or HTTPS content. Strings for Onion Service Page Info page are pulled from Torbutton's localization strings. - - - - - 26bf7ef2 by Kathy Brade at 2022-12-09T15:40:14+01:00 Bug 30237: Add v3 onion services client authentication prompt When Tor informs the browser that client authentication is needed, temporarily load about:blank instead of about:neterror and prompt for the user's key. If a correctly formatted key is entered, use Tor's ONION_CLIENT_AUTH_ADD control port command to add the key (via Torbutton's control port module) and reload the page. If the user cancels the prompt, display the standard about:neterror "Unable to connect" page. This requires a small change to browser/actors/NetErrorChild.jsm to account for the fact that the docShell no longer has the failedChannel information. The failedChannel is used to extract TLS-related error info, which is not applicable in the case of a canceled .onion authentication prompt. Add a leaveOpen option to PopupNotifications.show so we can display error messages within the popup notification doorhanger without closing the prompt. Add support for onion services strings to the TorStrings module. Add support for Tor extended SOCKS errors (Tor proposal 304) to the socket transport and SOCKS layers. Improved display of all of these errors will be implemented as part of bug 30025. Also fixes bug 19757: Add a "Remember this key" checkbox to the client auth prompt. Add an "Onion Services Authentication" section within the about:preferences "Privacy & Security section" to allow viewing and removal of v3 onion client auth keys that have been stored on disk. Also fixes bug 19251: use enhanced error pages for onion service errors. - - - - - b51dbf18 by Alex Catarineu at 2022-12-09T15:40:14+01:00 Bug 21952: Implement Onion-Location Whenever a valid Onion-Location HTTP header (or corresponding HTML <meta> http-equiv attribute) is found in a document load, we either redirect to it (if the user opted-in via preference) or notify the presence of an onionsite alternative with a badge in the urlbar. - - - - - be31392c by Pier Angelo Vendrame at 2022-12-09T15:40:15+01:00 Bug 40458: Implement .tor.onion aliases We have enabled HTTPS-Only mode, therefore we do not need HTTPS-Everywhere anymore. However, we want to keep supporting .tor.onion aliases (especially for securedrop). Therefore, in this patch we implemented the parsing of HTTPS-Everywhere rulesets, and the redirect of .tor.onion domains. Actually, Tor Browser believes they are actual domains. We change them on the fly on the SOCKS proxy requests to resolve the domain, and on the code that verifies HTTPS certificates. - - - - - 761d1177 by Pier Angelo Vendrame at 2022-12-09T15:40:15+01:00 Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This patch associates the about:manual page to a translated page that must be injected to browser/omni.ja after the build. The content must be placed in chrome/browser/content/browser/manual/, so that is then available at chrome://browser/content/manual/. We preferred giving absolute freedom to the web team, rather than having to change the patch in case of changes on the documentation. - - - - - 4603d588 by Pier Angelo Vendrame at 2022-12-09T15:40:16+01:00 Bug 41435: Add a Tor Browser migration function For now this function only deletes old language packs for which we are already packaging the strings with the application. - - - - - 30 changed files: - .eslintignore - .gitignore - + .gitlab/issue_templates/UXBug.md - + .gitlab/issue_templates/bug.md - + .gitmodules - + browser/actors/AboutTBUpdateChild.jsm - + browser/actors/AboutTBUpdateParent.jsm - + browser/actors/CryptoSafetyChild.jsm - + browser/actors/CryptoSafetyParent.jsm - browser/actors/NetErrorChild.jsm - browser/actors/NetErrorParent.jsm - browser/actors/moz.build - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/macbuild/Contents/MacOS-files.in - browser/app/permissions - + browser/app/profile/000-tor-browser.js - + browser/app/profile/001-base-profile.js - browser/app/profile/firefox.js - browser/base/content/aboutDialog-appUpdater.js - browser/base/content/aboutDialog.js - browser/base/content/aboutDialog.xhtml - + browser/base/content/abouttbupdate/aboutTBUpdate.css - + browser/base/content/abouttbupdate/aboutTBUpdate.js - + browser/base/content/abouttbupdate/aboutTBUpdate.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - + browser/base/content/browser-doctype.inc - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/browser-siteIdentity.js The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/6d99cd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-12.0] Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed to branch maint-12.0 at The Tor Project / Applications / tor-browser-build Commits: 62a1f93c by Richard Pospesel at 2022-12-09T11:22:21+00:00 Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe - - - - - 1 changed file: - projects/tor/config Changes: ===================================== projects/tor/config ===================================== @@ -15,6 +15,10 @@ targets: git_hash: main tag_gpg_id: 0 + windows: + var: + flag_mwindows: '-Wl,--subsystem,console' + linux-i686: var: libdir: lib32 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe
by Richard Pospesel (＠richard) 09 Dec '22

09 Dec '22

Richard Pospesel pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4068fc29 by Richard Pospesel at 2022-12-09T11:20:10+00:00 Bug 40708: tor.exe in tor-expert-bundle not writing stdout even when run from cmd.exe - - - - - 1 changed file: - projects/tor/config Changes: ===================================== projects/tor/config ===================================== @@ -15,6 +15,10 @@ targets: git_hash: main tag_gpg_id: 0 + windows: + var: + flag_mwindows: '-Wl,--subsystem,console' + linux-i686: var: libdir: lib32 View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0