- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-140.0esr-15.0-1] fixup! BB 40925: Implemented the Security Level component
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch base-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 2a9c02f3 by henry at 2025-07-17T14:46:09+00:00 fixup! BB 40925: Implemented the Security Level component TB 43610: Update CSS variable names. Also change the security level shield background to a new variable with closer semantics. (cherry picked from commit cf8b385f1f44518aa3cc79bd47c1597b2261658e) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 2 changed files: - browser/components/securitylevel/content/securityLevelPanel.css - browser/components/securitylevel/content/securityLevelPreferences.css Changes: ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -15,7 +15,7 @@ background-size: 9em 9em; -moz-context-properties: fill, fill-opacity; fill-opacity: 1; - fill: var(--button-bgcolor); + fill: var(--border-color-card); } /* NOTE: Use ":dir" instead of ":-moz-locale-dir" when panel switches to HTML. */ ===================================== browser/components/securitylevel/content/securityLevelPreferences.css ===================================== @@ -13,7 +13,7 @@ width: 24px; height: 24px; -moz-context-properties: fill; - fill: var(--in-content-icon-color); + fill: var(--icon-color); margin-block-start: var(--space-xsmall); margin-inline-end: var(--space-large); } @@ -92,7 +92,7 @@ #security-level-current { margin-block-start: var(--space-large); - background: var(--in-content-box-background); + background: var(--background-color-box); border: 1px solid var(--in-content-box-border-color); border-radius: var(--border-radius-small); padding: var(--space-medium); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2a9c02f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2a9c02f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] 7 commits: fixup! BB 40925: Implemented the Security Level component
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: cf8b385f by Henry Wilkes at 2025-07-17T15:08:43+01:00 fixup! BB 40925: Implemented the Security Level component TB 43610: Update CSS variable names. Also change the security level shield background to a new variable with closer semantics. - - - - - 1dcc5d46 by Henry Wilkes at 2025-07-17T15:08:45+01:00 fixup! TB 41803: Add some developer tools for working on tor-browser. TB 43610: Add script for missing CSS variables. - - - - - cc26b7f2 by Henry Wilkes at 2025-07-17T15:08:47+01:00 fixup! TB 30237: Add v3 onion services client authentication prompt TB 43610: Update CSS variable names. - - - - - f2ff56fd by Henry Wilkes at 2025-07-17T15:08:48+01:00 fixup! TB 40458: Implement .tor.onion aliases TB 43610: Update CSS variable names. - - - - - 1055f31d by Henry Wilkes at 2025-07-17T15:08:52+01:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 43610: Update CSS variable names. - - - - - 3503b669 by Henry Wilkes at 2025-07-17T15:08:54+01:00 fixup! Temporary changes to about:torconnect for Android. TB 43610: Drop the --onion-color variable. - - - - - 81547102 by Henry Wilkes at 2025-07-17T15:08:55+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 43610: Update CSS variable names. Also drop the --onion-opacity and --onion-color variables and use --icon-color instead. - - - - - 7 changed files: - browser/components/onionservices/content/authPreferences.css - browser/components/rulesets/content/aboutRulesets.css - browser/components/securitylevel/content/securityLevelPanel.css - browser/components/securitylevel/content/securityLevelPreferences.css - browser/components/torpreferences/content/torPreferences.css - toolkit/components/torconnect/content/aboutTorConnect.css - + tools/base-browser/missing-css-variables.py Changes: ===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -21,7 +21,7 @@ margin-inline-end: 4px; list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--in-content-warning-icon-color); + fill: var(--icon-color-warning); } /* Make a button appear disabled, whilst still allowing it to keep keyboard ===================================== browser/components/rulesets/content/aboutRulesets.css ===================================== @@ -159,7 +159,7 @@ aside { box-sizing: border-box; border-inline-end: 1px solid var(--in-content-border-color); - background-color: var(--in-content-box-background); + background-color: var(--background-color-box); } #ruleset-heading { @@ -223,7 +223,7 @@ aside { } #ruleset-list .selected { - border-inline-start-color: var(--in-content-accent-color); + border-inline-start-color: var(--color-accent-primary); } #ruleset-list .selected.disabled { @@ -252,7 +252,7 @@ aside { #ruleset-jwk-value { padding: 8px; border-radius: 2px; - background-color: var(--in-content-box-background); + background-color: var(--background-color-box); font-size: 85%; line-break: anywhere; /* ASCII-only text, so can set line-height. */ ===================================== browser/components/securitylevel/content/securityLevelPanel.css ===================================== @@ -15,7 +15,7 @@ background-size: 9em 9em; -moz-context-properties: fill, fill-opacity; fill-opacity: 1; - fill: var(--button-bgcolor); + fill: var(--border-color-card); } /* NOTE: Use ":dir" instead of ":-moz-locale-dir" when panel switches to HTML. */ ===================================== browser/components/securitylevel/content/securityLevelPreferences.css ===================================== @@ -13,7 +13,7 @@ width: 24px; height: 24px; -moz-context-properties: fill; - fill: var(--in-content-icon-color); + fill: var(--icon-color); margin-block-start: var(--space-xsmall); margin-inline-end: var(--space-large); } @@ -92,7 +92,7 @@ #security-level-current { margin-block-start: var(--space-large); - background: var(--in-content-box-background); + background: var(--background-color-box); border: 1px solid var(--in-content-box-border-color); border-radius: var(--border-radius-small); padding: var(--space-medium); ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -154,7 +154,7 @@ button.spoof-button-disabled { } .tor-focusable-heading:focus-visible { - outline-offset: var(--in-content-focus-outline-offset); + outline-offset: var(--focus-outline-offset); } .bridge-status-badge { @@ -303,7 +303,7 @@ button.spoof-button-disabled { width: 16px; height: 16px; -moz-context-properties: fill; - fill: var(--in-content-icon-color); + fill: var(--icon-color); } .tor-bridges-options-button { @@ -390,8 +390,8 @@ button.spoof-button-disabled { #tor-bridges-grid-display .tor-bridges-grid-cell:focus-visible { /* #tor-bridges-grid-display has focus management for its cells. */ - outline: var(--in-content-focus-outline); - outline-offset: var(--in-content-focus-outline-offset); + outline: var(--focus-outline); + outline-offset: var(--focus-outline-offset); } .tor-bridges-grid-cell { @@ -551,7 +551,7 @@ button.spoof-button-disabled { justify-self: center; /* fill is the progress, stroke is the empty ring. */ -moz-context-properties: fill, stroke; - fill: var(--in-content-success-icon-color); + fill: var(--icon-color-success); stroke: var(--in-content-border-color); content: url("chrome://browser/content/torpreferences/lox-progress-ring.svg"); } @@ -568,7 +568,7 @@ button.spoof-button-disabled { align-self: center; justify-self: center; -moz-context-properties: fill; - fill: var(--in-content-icon-color); + fill: var(--icon-color); } #tor-bridges-lox-details .tor-bridges-lox-image-inner { @@ -617,7 +617,7 @@ button.spoof-button-disabled { display: grid; /* fill is the icon color, stroke is the border color. */ -moz-context-properties: fill, stroke; - fill: var(--in-content-icon-color); + fill: var(--icon-color); } .tor-bridges-lox-list-item-bridge::before { @@ -633,7 +633,7 @@ button.spoof-button-disabled { } #tor-bridges-lox-unlock-alert .tor-bridges-lox-list-item::before { - stroke: var(--in-content-success-icon-color); + stroke: var(--icon-color-success); } #tor-bridges-lox-remaining-invites { @@ -683,7 +683,7 @@ button.spoof-button-disabled { width: 16px; height: 16px; -moz-context-properties: fill; - fill: var(--in-content-icon-color); + fill: var(--icon-color); } #tor-bridges-provider-icon-telegram { @@ -925,7 +925,7 @@ hbox#torPreferences-requestBridge-incorrectCaptchaHbox { image#torPreferences-requestBridge-errorIcon { list-style-image: url("chrome://global/skin/icons/warning.svg"); -moz-context-properties: fill; - fill: var(--in-content-warning-icon-color); + fill: var(--icon-color-warning); } groupbox#torPreferences-bridges-group textarea { @@ -1030,8 +1030,8 @@ groupbox#torPreferences-bridges-group textarea { } #user-provide-bridge-grid-display:focus-visible { - outline: var(--in-content-focus-outline); - outline-offset: var(--in-content-focus-outline-offset); + outline: var(--focus-outline); + outline-offset: var(--focus-outline-offset); } /* Connection settings dialog */ ===================================== toolkit/components/torconnect/content/aboutTorConnect.css ===================================== @@ -5,11 +5,6 @@ @import url("chrome://global/skin/tor-colors.css"); @import url("chrome://global/skin/onion-pattern.css"); -:root { - --onion-opacity: 1; - --onion-color: var(--card-outline-color); -} - html { width: 100%; height: 100%; @@ -45,12 +40,12 @@ body:not(.loaded) { } .breadcrumb-item:hover { - color: var(--in-content-accent-color); + color: var(--color-accent-primary); background-color: var(--in-content-button-background-hover); } .breadcrumb-item:active { - color: var(--in-content-accent-color-active); + color: var(--color-accent-primary-active); background-color: var(--in-content-button-background-active); } @@ -73,7 +68,7 @@ body:not(.loaded) { } .breadcrumb-item.active { - color: var(--in-content-accent-color); + color: var(--color-accent-primary); } .breadcrumb-item.disabled, .breadcrumb-item.disabled:hover, .breadcrumb-item.disabled:active { @@ -268,9 +263,9 @@ body.aboutTorConnect { body.aboutTorConnect .title { background-image: url("chrome://global/content/torconnect/tor-connect.svg"); -moz-context-properties: stroke, fill, fill-opacity; - fill-opacity: var(--onion-opacity); - fill: var(--onion-color); - stroke: var(--onion-color); + fill-opacity: 1; + fill: var(--icon-color); + stroke: var(--icon-color); /* Make sure there is no padding between the title and #breadcrumbs. */ padding-block-start: 0; } @@ -285,7 +280,7 @@ body.aboutTorConnect .title:is(.assist, .final) { body.aboutTorConnect .title.location { background-image: url("chrome://global/content/torconnect/connection-location.svg"); - stroke: var(--in-content-warning-icon-color); + stroke: var(--icon-color-warning); } /* Android-specific CSS, to be removed when we use only the native UI. */ @@ -301,13 +296,12 @@ body.aboutTorConnect .title.location { } body.android { - --onion-color: var(--android-dark-text-primary); width: 100%; height: 100%; box-sizing: border-box; margin: 0; padding: 0 24px !important; - color: var(--onion-color); + color: var(--android-dark-text-primary); background: linear-gradient(194deg, #692E9D -0.93%, #393270 48.91%); font: menu; font-size: 14px; ===================================== tools/base-browser/missing-css-variables.py ===================================== @@ -0,0 +1,88 @@ +""" +Simple tool for checking for missing CSS declarations. + +Should be run from the root directory and passed a single CSS file path to +check the variables for. + +Missing variables will be printed to stdout, if any. Variables are considered +missing if they are not declared in the same file or in one of the expected +CSS files. CSS variables that are declared in javascript an unexpected CSS file +will not be found. + +Exits with 0 if no variables are missing. Otherwise exits with 1. +""" + +import re +import sys +from pathlib import Path + +declare_dirs = [ + Path("browser/branding"), + Path("browser/themes"), + Path("toolkit/themes"), +] + +var_dec_regex = re.compile(r"^\s*(?P<name>--[\w_-]+)\s*:") +var_use_regex = re.compile(r":.*(?P<name>--[\w_-]+)") + + +def remove_vars_in_file(var_set: set[str], file_path: Path) -> bool: + """ + Checks the CSS file for declarations of the given variables and removes + them. + + :param var_set: The set of CSS variables to check and remove. + :param file_path: The path to a CSS file to check within. + :returns: Whether the variable set is now empty. + """ + with file_path.open() as file: + for line in file: + var_dec_match = var_dec_regex.match(line) + if not var_dec_match: + continue + var_name = var_dec_match.group("name") + if var_name in var_set: + print(f"{var_name} declared in {file_path}", file=sys.stderr) + var_set.remove(var_name) + if not var_set: + return True + return False + + +def find_missing(file_path: Path) -> set[str]: + """ + Search for CSS variables in the CSS file and check whether any are missing + known declarations. + + :param file_path: The path of the CSS file to check. + :returns: The names of the missing variables. + """ + used_vars: set[str] = set() + + with open(file_path) as file: + for line in file: + for match in var_use_regex.finditer(line): + used_vars.add(match.group("name")) + + if not used_vars: + print("No CSS variables found", file=sys.stderr) + return used_vars + + # Remove any CSS variables that are declared within the same file. + if remove_vars_in_file(used_vars, file_path): + return used_vars + + # And remove any that are in the expected declaration files. + for top_dir in declare_dirs: + for css_file_path in top_dir.rglob("*.css"): + if remove_vars_in_file(used_vars, css_file_path): + return used_vars + + return used_vars + + +missing_vars = find_missing(Path(sys.argv[1])) +for var_name in missing_vars: + print(var_name) + +sys.exit(1 if missing_vars else 0) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8b9cbd… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/8b9cbd… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_140_1_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 17 Jul '25

17 Jul '25

Pier Angelo Vendrame pushed new tag FIREFOX_140_1_0esr_BUILD1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/FIREF… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_140_1_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 17 Jul '25

17 Jul '25

Pier Angelo Vendrame pushed new tag FIREFOX_140_1_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] 2 commits: fixup! TB 41803: Add some developer tools for working on tor-browser.
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 02d6a786 by Henry Wilkes at 2025-07-17T14:20:24+01:00 fixup! TB 41803: Add some developer tools for working on tor-browser. TB 43954: Handle lightweight tags for FIREFOX_. - - - - - 8b9cbdf4 by Henry Wilkes at 2025-07-17T14:23:17+01:00 fixup! TB 41803: Add some developer tools for working on tor-browser. TB 43962: Update git rebase preprocessor for git 2.50. - - - - - 2 changed files: - tools/base-browser/git-rebase-fixup-preprocessor - tools/base-browser/tb-dev Changes: ===================================== tools/base-browser/git-rebase-fixup-preprocessor ===================================== @@ -28,7 +28,9 @@ class TodoLine: Represents a line in the git todo file. """ - _PICK_REGEX = re.compile(r"^pick [a-f0-9]+ (?P<fixups>(fixup! )*)(?P<title>.*)") + # git 2.50 adds a '#' between the commit hash and the commit subject. + # Keep this '#' optional for previous git versions. + _PICK_REGEX = re.compile(r"^pick [a-f0-9]+ +(?:# +)?(?P<fixups>(fixup! )*)(?P<title>.*)") def __init__(self, line): """ ===================================== tools/base-browser/tb-dev ===================================== @@ -152,24 +152,26 @@ def get_refs(ref_type, name_start): or "head") that starts with the given 'name_start'. """ if ref_type == "tag": - # Instead of returning tag hash, return the commit hash it points to. - fstring = "%(*objectname)" ref_start = "refs/tags/" elif ref_type == "remote": - fstring = "%(objectname)" ref_start = "refs/remotes/" elif ref_type == "head": - fstring = "%(objectname)" ref_start = "refs/heads/" else: raise TypeError(f"Unknown type {ref_type}") - fstring = f"{fstring},%(refname)" + fstring = "%(*objectname),%(objectname),%(refname)" pattern = f"{ref_start}{name_start}**" def line_to_ref(line): - [commit, ref_name] = line.split(",", 1) - return Reference(ref_name.replace(ref_start, "", 1), commit) + [objectname_reference, objectname, ref_name] = line.split(",", 2) + # For annotated tags, the objectname_reference is non-empty and points + # to an actual commit. + # For remotes, heads and lightweight tags, the objectname_reference will + # be empty and objectname will point directly to the commit. + return Reference( + ref_name.replace(ref_start, "", 1), objectname_reference or objectname + ) return [ line_to_ref(line) @@ -245,7 +247,7 @@ def file_contains(filename, regex): Return whether the file is a utf-8 text file containing the regular expression given by 'regex'. """ - with open(filename, "r", encoding="utf-8") as file: + with open(filename, encoding="utf-8") as file: try: for line in file: if regex.search(line): View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b6c948… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/b6c948… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.0esr-15.0-1] fixup! BB 40926: Implemented the New Identity feature
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch mullvad-browser-140.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 350f2221 by Henry Wilkes at 2025-07-17T14:13:07+01:00 fixup! BB 40926: Implemented the New Identity feature TB 43638: Add the cmd_newIdentity command element and use it. - - - - - 7 changed files: - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-init.js - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/customizableui/CustomizeMode.sys.mjs - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -58,7 +58,8 @@ <toolbarbutton id="appMenu-new-identity" class="subviewbutton" data-l10n-id="appmenuitem-new-identity" - key="new-identity-key"/> + key="new-identity-key" + command="cmd_newIdentity"/> <toolbarseparator/> <toolbarbutton id="appMenu-bookmarks-button" class="subviewbutton subviewbutton-nav" ===================================== browser/base/content/browser-init.js ===================================== @@ -229,9 +229,6 @@ var gBrowserInit = { // Init the SecurityLevelButton SecurityLevelButton.init(); - // Init the NewIdentityButton - NewIdentityButton.init(); - // Certain kinds of automigration rely on this notification to complete // their tasks BEFORE the browser window is shown. SessionStore uses it to // restore tabs into windows AFTER important parts like gMultiProcessBrowser @@ -1043,8 +1040,6 @@ var gBrowserInit = { SecurityLevelButton.uninit(); - NewIdentityButton.uninit(); - if (gToolbarKeyNavEnabled) { ToolbarKeyboardNavigator.uninit(); } ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -22,7 +22,9 @@ key="key_privatebrowsing" data-l10n-id="menu-file-new-private-window"/> <menuseparator/> <menuitem id="menu_newIdentity" - key="new-identity-key" data-l10n-id="menu-new-identity"/> + command="cmd_newIdentity" + key="new-identity-key" + data-l10n-id="menu-new-identity"/> <menuseparator/> <menuitem id="menu_openLocation" hidden="true" ===================================== browser/base/content/browser-sets.inc ===================================== @@ -112,6 +112,8 @@ #ifdef XP_MACOSX <command id="zoomWindow" data-l10n-id="window-zoom-command" /> #endif + + <command id="cmd_newIdentity" /> </commandset> #include ../../components/places/content/placesCommands.inc.xhtml ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -574,7 +574,9 @@ command="cmd_newNavigator" tooltip="dynamic-shortcut-tooltip"/> - <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="new-identity-button" + command="cmd_newIdentity" + class="toolbarbutton-1 chromeclass-toolbar-additional" data-l10n-id="toolbar-new-identity"/> <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" ===================================== browser/components/customizableui/CustomizeMode.sys.mjs ===================================== @@ -251,6 +251,7 @@ export class CustomizeMode { "Browser:NewUserContextTab", "Tools:PrivateBrowsing", "zoomWindow", + "cmd_newIdentity", ]); /** ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -501,34 +501,6 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { let newIdentityInProgress = false; return { - topics, - - init() { - // We first search in the DOM for the identity button. If it does not - // exist it may be in the toolbox palette. In the latter case we still - // need to initialize the button in case it is added back later through - // customization. - const button = - document.getElementById("new-identity-button") || - window.gNavToolbox.palette.querySelector("#new-identity-button"); - button?.addEventListener("command", () => { - this.onCommand(); - }); - document - .getElementById("appMenu-viewCache") - .content.querySelector("#appMenu-new-identity") - ?.addEventListener("command", () => { - this.onCommand(); - }); - document - .getElementById("menu_newIdentity") - ?.addEventListener("command", () => { - this.onCommand(); - }); - }, - - uninit() {}, - async onCommand() { try { // Ignore if there's a New Identity in progress to avoid race View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/350… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/350… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.0esr-15.0-1] fixup! BB 40926: Implemented the New Identity feature
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch base-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 35f56812 by Henry Wilkes at 2025-07-17T14:06:34+01:00 fixup! BB 40926: Implemented the New Identity feature TB 43638: Add the cmd_newIdentity command element and use it. - - - - - 7 changed files: - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-init.js - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/navigator-toolbox.inc.xhtml - browser/components/customizableui/CustomizeMode.sys.mjs - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -58,7 +58,8 @@ <toolbarbutton id="appMenu-new-identity" class="subviewbutton" data-l10n-id="appmenuitem-new-identity" - key="new-identity-key"/> + key="new-identity-key" + command="cmd_newIdentity"/> <toolbarseparator/> <toolbarbutton id="appMenu-bookmarks-button" class="subviewbutton subviewbutton-nav" ===================================== browser/base/content/browser-init.js ===================================== @@ -229,9 +229,6 @@ var gBrowserInit = { // Init the SecurityLevelButton SecurityLevelButton.init(); - // Init the NewIdentityButton - NewIdentityButton.init(); - // Certain kinds of automigration rely on this notification to complete // their tasks BEFORE the browser window is shown. SessionStore uses it to // restore tabs into windows AFTER important parts like gMultiProcessBrowser @@ -1043,8 +1040,6 @@ var gBrowserInit = { SecurityLevelButton.uninit(); - NewIdentityButton.uninit(); - if (gToolbarKeyNavEnabled) { ToolbarKeyboardNavigator.uninit(); } ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -22,7 +22,9 @@ key="key_privatebrowsing" data-l10n-id="menu-file-new-private-window"/> <menuseparator/> <menuitem id="menu_newIdentity" - key="new-identity-key" data-l10n-id="menu-new-identity"/> + command="cmd_newIdentity" + key="new-identity-key" + data-l10n-id="menu-new-identity"/> <menuseparator/> <menuitem id="menu_openLocation" hidden="true" ===================================== browser/base/content/browser-sets.inc ===================================== @@ -112,6 +112,8 @@ #ifdef XP_MACOSX <command id="zoomWindow" data-l10n-id="window-zoom-command" /> #endif + + <command id="cmd_newIdentity" /> </commandset> #include ../../components/places/content/placesCommands.inc.xhtml ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -574,7 +574,9 @@ command="cmd_newNavigator" tooltip="dynamic-shortcut-tooltip"/> - <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="new-identity-button" + command="cmd_newIdentity" + class="toolbarbutton-1 chromeclass-toolbar-additional" data-l10n-id="toolbar-new-identity"/> <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" ===================================== browser/components/customizableui/CustomizeMode.sys.mjs ===================================== @@ -251,6 +251,7 @@ export class CustomizeMode { "Browser:NewUserContextTab", "Tools:PrivateBrowsing", "zoomWindow", + "cmd_newIdentity", ]); /** ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -501,34 +501,6 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { let newIdentityInProgress = false; return { - topics, - - init() { - // We first search in the DOM for the identity button. If it does not - // exist it may be in the toolbox palette. In the latter case we still - // need to initialize the button in case it is added back later through - // customization. - const button = - document.getElementById("new-identity-button") || - window.gNavToolbox.palette.querySelector("#new-identity-button"); - button?.addEventListener("command", () => { - this.onCommand(); - }); - document - .getElementById("appMenu-viewCache") - .content.querySelector("#appMenu-new-identity") - ?.addEventListener("command", () => { - this.onCommand(); - }); - document - .getElementById("menu_newIdentity") - ?.addEventListener("command", () => { - this.onCommand(); - }); - }, - - uninit() {}, - async onCommand() { try { // Ignore if there's a New Identity in progress to avoid race View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35f5681… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/35f5681… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] 2 commits: fixup! BB 40926: Implemented the New Identity feature
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: b2905b2c by Henry Wilkes at 2025-07-17T13:01:51+00:00 fixup! BB 40926: Implemented the New Identity feature TB 43638: Add the cmd_newIdentity command element and use it. - - - - - b6c948ee by Henry Wilkes at 2025-07-17T13:01:51+00:00 fixup! TB 3455: Add DomainIsolator, for isolating circuit by domain. TB 43638: Update the usage of cmd_newCircuit. - - - - - 8 changed files: - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-init.js - browser/base/content/browser-menubar.inc - browser/base/content/browser-sets.inc - browser/base/content/navigator-toolbox.inc.xhtml - browser/base/content/navigator-toolbox.js - browser/components/customizableui/CustomizeMode.sys.mjs - browser/components/newidentity/content/newidentity.js Changes: ===================================== browser/base/content/appmenu-viewcache.inc.xhtml ===================================== @@ -58,7 +58,8 @@ <toolbarbutton id="appMenu-new-identity" class="subviewbutton" data-l10n-id="appmenuitem-new-identity" - key="new-identity-key"/> + key="new-identity-key" + command="cmd_newIdentity"/> <toolbarbutton id="appMenuNewCircuit" class="subviewbutton" key="new-circuit-key" ===================================== browser/base/content/browser-init.js ===================================== @@ -229,9 +229,6 @@ var gBrowserInit = { // Init the SecurityLevelButton SecurityLevelButton.init(); - // Init the NewIdentityButton - NewIdentityButton.init(); - gTorConnectUrlbarButton.init(); gTorConnectTitlebarStatus.init(); @@ -1065,8 +1062,6 @@ var gBrowserInit = { SecurityLevelButton.uninit(); - NewIdentityButton.uninit(); - gTorConnectUrlbarButton.uninit(); gTorConnectTitlebarStatus.uninit(); ===================================== browser/base/content/browser-menubar.inc ===================================== @@ -22,7 +22,9 @@ key="key_privatebrowsing" data-l10n-id="menu-file-new-private-window"/> <menuseparator/> <menuitem id="menu_newIdentity" - key="new-identity-key" data-l10n-id="menu-new-identity"/> + command="cmd_newIdentity" + key="new-identity-key" + data-l10n-id="menu-new-identity"/> <menuitem id="menu_newCircuit" key="new-circuit-key" data-l10n-id="menu-new-tor-circuit" command="cmd_newCircuit"/> ===================================== browser/base/content/browser-sets.inc ===================================== @@ -113,7 +113,8 @@ <command id="zoomWindow" data-l10n-id="window-zoom-command" /> #endif - <command id ="cmd_newCircuit" /> + <command id="cmd_newIdentity" /> + <command id="cmd_newCircuit" /> </commandset> #include ../../components/places/content/placesCommands.inc.xhtml ===================================== browser/base/content/navigator-toolbox.inc.xhtml ===================================== @@ -601,10 +601,14 @@ command="cmd_newNavigator" tooltip="dynamic-shortcut-tooltip"/> - <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="new-identity-button" + command="cmd_newIdentity" + class="toolbarbutton-1 chromeclass-toolbar-additional" data-l10n-id="toolbar-new-identity"/> - <toolbarbutton id="new-circuit-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="new-circuit-button" + command="cmd_newCircuit" + class="toolbarbutton-1 chromeclass-toolbar-additional" data-l10n-id="toolbar-new-tor-circuit"/> <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional" ===================================== browser/base/content/navigator-toolbox.js ===================================== @@ -51,8 +51,7 @@ document.addEventListener( #BMB_bookmarksPopup, #BMB_viewBookmarksSidebar, #BMB_searchBookmarks, - #BMB_viewBookmarksToolbar, - #new-circuit-button`); + #BMB_viewBookmarksToolbar`); if (!element) { return; } @@ -93,10 +92,6 @@ document.addEventListener( BookmarkingUI.toggleBookmarksToolbar("bookmarks-widget"); break; - case "new-circuit-button": - TorDomainIsolator.newCircuitForBrowser(gBrowser.selectedBrowser); - break; - default: if (element.classList.contains("content-analysis-indicator")) { ContentAnalysis.showPanel(element, PanelUI); ===================================== browser/components/customizableui/CustomizeMode.sys.mjs ===================================== @@ -251,6 +251,8 @@ export class CustomizeMode { "Browser:NewUserContextTab", "Tools:PrivateBrowsing", "zoomWindow", + "cmd_newIdentity", + "cmd_newCircuit", ]); /** ===================================== browser/components/newidentity/content/newidentity.js ===================================== @@ -501,34 +501,6 @@ ChromeUtils.defineLazyGetter(this, "NewIdentityButton", () => { let newIdentityInProgress = false; return { - topics, - - init() { - // We first search in the DOM for the identity button. If it does not - // exist it may be in the toolbox palette. In the latter case we still - // need to initialize the button in case it is added back later through - // customization. - const button = - document.getElementById("new-identity-button") || - window.gNavToolbox.palette.querySelector("#new-identity-button"); - button?.addEventListener("command", () => { - this.onCommand(); - }); - document - .getElementById("appMenu-viewCache") - .content.querySelector("#appMenu-new-identity") - ?.addEventListener("command", () => { - this.onCommand(); - }); - document - .getElementById("menu_newIdentity") - ?.addEventListener("command", () => { - this.onCommand(); - }); - }, - - uninit() {}, - async onCommand() { try { // Ignore if there's a New Identity in progress to avoid race View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/360585… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/360585… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.0esr-15.0-1] fixup! Firefox preference overrides.
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch mullvad-browser-140.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 0de650fd by henry at 2025-07-17T13:50:04+01:00 fixup! Firefox preference overrides. TB 43989: Disable the preference for the AI chatbot in the new sidebar. (cherry picked from commit 360585a09bf653ca9c2a047a9c57ef2959b2c5d9) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -306,9 +306,12 @@ pref("browser.search.serpEventTelemetryCategorization.enabled", false); // tor-browser#42872, #42555: Disable translations. // Translation have a bad UX in 128 (and with our config). Maybe we will -// re-enable after auditing and fixing the UX. +// re-enable after auditing and fixing the UX (tor-browser#41837). pref("browser.translations.enable", false); +// Disable third party AI chatbot. tor-browser#43989. +pref("browser.ml.chat.enabled", false); + // tor-browser#41945 - disable automatic cookie banners dismissal until // we're sure it does not causes fingerprinting risks or other issues. pref("cookiebanners.service.mode", 0); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/0de… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/0de… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.0esr-15.0-1] fixup! Firefox preference overrides.
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch base-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 0720429c by henry at 2025-07-17T12:46:03+00:00 fixup! Firefox preference overrides. TB 43989: Disable the preference for the AI chatbot in the new sidebar. (cherry picked from commit 360585a09bf653ca9c2a047a9c57ef2959b2c5d9) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -306,9 +306,12 @@ pref("browser.search.serpEventTelemetryCategorization.enabled", false); // tor-browser#42872, #42555: Disable translations. // Translation have a bad UX in 128 (and with our config). Maybe we will -// re-enable after auditing and fixing the UX. +// re-enable after auditing and fixing the UX (tor-browser#41837). pref("browser.translations.enable", false); +// Disable third party AI chatbot. tor-browser#43989. +pref("browser.ml.chat.enabled", false); + // tor-browser#41945 - disable automatic cookie banners dismissal until // we're sure it does not causes fingerprinting risks or other issues. pref("cookiebanners.service.mode", 0); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0720429… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0720429… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] fixup! Firefox preference overrides.
by henry (＠henry) 17 Jul '25

17 Jul '25

henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 360585a0 by Henry Wilkes at 2025-07-17T12:45:10+00:00 fixup! Firefox preference overrides. TB 43989: Disable the preference for the AI chatbot in the new sidebar. - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -306,9 +306,12 @@ pref("browser.search.serpEventTelemetryCategorization.enabled", false); // tor-browser#42872, #42555: Disable translations. // Translation have a bad UX in 128 (and with our config). Maybe we will -// re-enable after auditing and fixing the UX. +// re-enable after auditing and fixing the UX (tor-browser#41837). pref("browser.translations.enable", false); +// Disable third party AI chatbot. tor-browser#43989. +pref("browser.ml.chat.enabled", false); + // tor-browser#41945 - disable automatic cookie banners dismissal until // we're sure it does not causes fingerprinting risks or other issues. pref("cookiebanners.service.mode", 0); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/360585a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/360585a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] amend! TB 43987 [Android]: disable optimization for org.mozilla.experiments.nimbus.Nimbus
by boklm (＠boklm) 17 Jul '25

17 Jul '25

boklm pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 501c2eb9 by Nicolas Vigier at 2025-07-17T12:21:53+02:00 amend! TB 43987 [Android]: disable optimization for org.mozilla.experiments.nimbus.Nimbus TB 43987 [Android]: disable optimization for org.mozilla.experiments.nimbus Fixing a reproducibility issue. - - - - - 1 changed file: - mobile/android/fenix/app/proguard-rules.pro Changes: ===================================== mobile/android/fenix/app/proguard-rules.pro ===================================== @@ -134,6 +134,6 @@ # Workaround for 'already has mapping' r8 issue (https://issuetracker.google.com/issues/140851070) -keep class com.google.android.gms.common.internal.BaseGmsClient { *; } -# tor-browser#43987 - Keep org.mozilla.experiments.nimbus.Nimbus to fix +# tor-browser#43987 - Keep org.mozilla.experiments.nimbus to fix # reproducibility issue --keep class org.mozilla.experiments.nimbus.Nimbus { *; } +-keep class org.mozilla.experiments.nimbus.** { *; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/501c2eb… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/501c2eb… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_NIGHTLY_141_END
by brizental (＠brizental) 17 Jul '25

17 Jul '25

brizental pushed new tag FIREFOX_NIGHTLY_141_END at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_N… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_NIGHTLY_141_END
by brizental (＠brizental) 17 Jul '25

17 Jul '25

brizental pushed new tag FIREFOX_NIGHTLY_141_END at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/FIREF… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-141.0a1-16.0-1
by brizental (＠brizental) 17 Jul '25

17 Jul '25

brizental pushed new branch mullvad-browser-141.0a1-16.0-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… 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-141.0a1-16.0-1
by brizental (＠brizental) 17 Jul '25

17 Jul '25

brizental pushed new branch base-browser-141.0a1-16.0-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-141.0a1-16.0-1
by brizental (＠brizental) 17 Jul '25

17 Jul '25

brizental pushed new branch tor-browser-141.0a1-16.0-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 41227: Add binutils to the toolchain update script.
by Pier Angelo Vendrame (＠pierov) 17 Jul '25

17 Jul '25

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 290ea887 by Pier Angelo Vendrame at 2025-07-17T12:15:30+02:00 Bug 41227: Add binutils to the toolchain update script. - - - - - 1 changed file: - projects/common/list_toolchain_updates-common-firefox-geckoview Changes: ===================================== projects/common/list_toolchain_updates-common-firefox-geckoview ===================================== @@ -153,3 +153,18 @@ EOF needed=$(cat python/mozboot/bin/bootstrap.py | perl -ne "$p") current="3.8+" # 3.11.x on Debian bookworm, 3.9.20 on our python project check_update_needed python "$needed" "$current" + + +# binutils +read -d '' p << 'EOF' || true + +my $d = YAML::XS::LoadFile('taskcluster/kinds/toolchain/misc.yml'); +my $f = $d->{'linux64-binutils'}{fetches}{fetch}[0]; +my ($version) = $f =~ m|^binutils-([0-9\\.]+)|; +exit 1 unless $version; +print "$version\\n"; +EOF + +needed=$(perl -MYAML::XS -e "$p") +current='[% pc("binutils", "version") %]' +check_update_needed node "$needed" "$current" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/2… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] TB 43987 [Android]: disable optimization for org.mozilla.experiments.nimbus.Nimbus
by boklm (＠boklm) 17 Jul '25

17 Jul '25

boklm pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: d4d0ff81 by Nicolas Vigier at 2025-07-17T08:31:12+02:00 TB 43987 [Android]: disable optimization for org.mozilla.experiments.nimbus.Nimbus Fixing a reproducibility issue. - - - - - 1 changed file: - mobile/android/fenix/app/proguard-rules.pro Changes: ===================================== mobile/android/fenix/app/proguard-rules.pro ===================================== @@ -133,3 +133,7 @@ # Workaround for 'already has mapping' r8 issue (https://issuetracker.google.com/issues/140851070) -keep class com.google.android.gms.common.internal.BaseGmsClient { *; } + +# tor-browser#43987 - Keep org.mozilla.experiments.nimbus.Nimbus to fix +# reproducibility issue +-keep class org.mozilla.experiments.nimbus.Nimbus { *; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d4d0ff8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d4d0ff8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] 3 commits: fixup! TB 40597: Implement TorSettings module
by henry (＠henry) 16 Jul '25

16 Jul '25

henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: da315c55 by Henry Wilkes at 2025-07-16T18:30:55+01:00 fixup! TB 40597: Implement TorSettings module TB 43766: Save TorSettings to preferences in separate groups. - - - - - bfe6d078 by Henry Wilkes at 2025-07-16T18:30:56+01:00 fixup! TB 40597: Implement TorSettings module TB 43766: Update a FIXME comment to point to a newer issue. - - - - - 3f8590fc by Henry Wilkes at 2025-07-16T18:30:56+01:00 fixup! Lox integration TB 43765: Disable lox on alpha channel. - - - - - 2 changed files: - toolkit/components/lox/Lox.sys.mjs - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== toolkit/components/lox/Lox.sys.mjs ===================================== @@ -1,5 +1,4 @@ /* eslint-disable mozilla/valid-lazy */ -import { AppConstants } from "resource://gre/modules/AppConstants.sys.mjs"; import { clearInterval, setInterval, @@ -121,7 +120,7 @@ class LoxImpl { * * @type {boolean} */ - #enabled = AppConstants.MOZ_UPDATE_CHANNEL !== "release"; + #enabled = false; get enabled() { return this.#enabled; ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -612,8 +612,7 @@ class TorSettingsImpl { this.#settings.bridges.source === TorBridgeSource.Lox ) { // Re-trigger the call to lazy.Lox.getBridges. - // FIXME: This can compete with TorConnect to reach TorProvider. - // tor-browser#42316 + // FIXME: This can cancel a bootstrap. tor-browser#43991. this.changeSettings({ bridges: { source: TorBridgeSource.Lox, @@ -767,14 +766,11 @@ class TorSettingsImpl { } /** - * Save our settings to prefs. + * Save our bridge settings. */ - #saveToPrefs() { - lazy.logger.debug("saveToPrefs()"); + #saveBridgeSettings() { + lazy.logger.debug("Saving bridge settings"); - this.#checkIfInitialized(); - - /* Bridges */ Services.prefs.setBoolPref( TorSettingsPrefs.bridges.enabled, this.#settings.bridges.enabled @@ -812,7 +808,14 @@ class TorSettingsImpl { ); }); } - /* Proxy */ + } + + /** + * Save our proxy settings. + */ + #saveProxySettings() { + lazy.logger.debug("Saving proxy settings"); + Services.prefs.setBoolPref( TorSettingsPrefs.proxy.enabled, this.#settings.proxy.enabled @@ -845,7 +848,14 @@ class TorSettingsImpl { Services.prefs.clearUserPref(TorSettingsPrefs.proxy.username); Services.prefs.clearUserPref(TorSettingsPrefs.proxy.password); } - /* Firewall */ + } + + /** + * Save our firewall settings. + */ + #saveFirewallSettings() { + lazy.logger.debug("Saving firewall settings"); + Services.prefs.setBoolPref( TorSettingsPrefs.firewall.enabled, this.#settings.firewall.enabled @@ -1403,7 +1413,32 @@ class TorSettingsImpl { // No errors so far, so save and commit. this.#settings = completeSettings; - this.#saveToPrefs(); + // NOTE: We want to avoid overwriting saved preference values unless the + // user actually makes a change in their settings. + // In particular, if we fail to load a setting at startup due to a bug, the + // #settings object for that group will point to the #defaultSettings value + // instead. We do not want to write these #defaultSettings to the user's + // settings unless the user actually makes a change in one of the groups. + // E.g. we do not want a change in the proxy settings to overwrite the + // saved bridge settings. Hence, we only save the groups that have changes. + // See tor-browser#43766. + // NOTE: We could go more fine-grained and only save the preference values + // that actually change. E.g. only save the bridges.enabled pref when the + // user switches the toggle, and leave the bridges.bridge_strings as they + // are. However, at the time of implementation there is no known benefit to + // doing this, since the #defaultSettings will not allow for any changes + // that don't require changing the group entirely. E.g. to change + // bridges.enabled when starting with the #defaultSettings.bridges, + // bridges.bridge_strings must necessarily be set. + if (apply.bridges) { + this.#saveBridgeSettings(); + } + if (apply.proxy) { + this.#saveProxySettings(); + } + if (apply.firewall) { + this.#saveFirewallSettings(); + } if (changes.length) { Services.obs.notifyObservers( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0a4f89… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0a4f89… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.0esr-15.0-1] 2 commits: fixup! MB 112: Updater customization for Mullvad Browser
by henry (＠henry) 16 Jul '25

16 Jul '25

henry pushed to branch mullvad-browser-140.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 97229a59 by Henry Wilkes at 2025-07-16T18:10:58+01:00 fixup! MB 112: Updater customization for Mullvad Browser TB 42738: Move override logic to the about:mullvad-browser commit. - - - - - 2909cc84 by Henry Wilkes at 2025-07-16T18:10:59+01:00 fixup! MB 39: Add home page about:mullvad-browser TB 43929: Update about:mullvad-browser override page logic for ESR 140. TB 42738: Move these changes to the about:mullvad-browser commit. - - - - - 1 changed file: - browser/components/BrowserContentHandler.sys.mjs Changes: ===================================== browser/components/BrowserContentHandler.sys.mjs ===================================== @@ -781,6 +781,7 @@ nsBrowserContentHandler.prototype = { var overridePage = ""; var additionalPage = ""; var willRestoreSession = false; + let openAboutMullvadBrowser = false; try { // Read the old value of homepage_override.mstone before // needHomepageOverride updates it, so that we can later add it to the @@ -986,13 +987,8 @@ nsBrowserContentHandler.prototype = { "mullvadbrowser.post_update.shouldNotify", true ); - // If the user's homepage is about:mullvad-browser, we will inform - // them about the update on that page; otherwise, we arrange to - // open about:mullvad-browser in a secondary tab. - overridePage = - startPage === "about:mullvad-browser" - ? "" - : "about:mullvad-browser"; + openAboutMullvadBrowser = true; + overridePage = "about:mullvad-browser"; } break; } @@ -1093,6 +1089,16 @@ nsBrowserContentHandler.prototype = { startPage = ""; } + // If the user's homepage is about:mullvad-browser, we do not want to open + // it twice with the override. + if ( + openAboutMullvadBrowser && + startPage === "about:mullvad-browser" && + overridePage?.split("|").includes("about:mullvad-browser") + ) { + startPage = ""; + } + // Only show the startPage if we're not restoring an update session and are // not set to skip the start page on this profile if (overridePage && startPage && !willRestoreSession && !skipStartPage) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/4e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/4e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] 3 commits: fixup! TB 41668: Tweaks to the Base Browser updater for Tor Browser
by henry (＠henry) 16 Jul '25

16 Jul '25

henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 7ed4b70d by Henry Wilkes at 2025-07-16T18:08:29+01:00 fixup! TB 41668: Tweaks to the Base Browser updater for Tor Browser TB 42738: Move override logic to the about:tor commit. - - - - - 84a5fe09 by Henry Wilkes at 2025-07-16T18:08:30+01:00 fixup! TB 7494: Create local home page for TBB. TB 42738: Temporarily revert the about:tor changes to BrowserContentHandler.sys.mjs. - - - - - 0a4f89ea by Henry Wilkes at 2025-07-16T18:08:31+01:00 fixup! TB 7494: Create local home page for TBB. TB 43929: Update about:tor override page logic for ESR 140. Unlike ESR 128, we do not try and move the startPage logic to earlier in the method since it would complicate the patch and upstream's logic. Instead, we delay out duplicate about:tor logic until the end of the method. - - - - - 1 changed file: - browser/components/BrowserContentHandler.sys.mjs Changes: ===================================== browser/components/BrowserContentHandler.sys.mjs ===================================== @@ -781,6 +781,7 @@ nsBrowserContentHandler.prototype = { var overridePage = ""; var additionalPage = ""; var willRestoreSession = false; + let openAboutTor = false; try { // Read the old value of homepage_override.mstone before // needHomepageOverride updates it, so that we can later add it to the @@ -980,16 +981,14 @@ nsBrowserContentHandler.prototype = { // Tor Browser: Instead of opening the post-update "override page" // directly, we ensure that about:tor will be opened, which should // notify the user that their browser was updated. - // NOTE: We ignore any overridePage value, which can come from the - // openURL attribute within the updates.xml file. + // NOTE: We ignore any existing overridePage value, which can come + // from the openURL attribute within the updates.xml file. Services.prefs.setBoolPref( "torbrowser.post_update.shouldNotify", true ); - // If the user's homepage is about:tor, we will inform them - // about the update on that page; otherwise, we arrange to - // open about:tor in a secondary tab. - overridePage = startPage === "about:tor" ? "" : "about:tor"; + openAboutTor = true; + overridePage = "about:tor"; } break; } @@ -1090,6 +1089,16 @@ nsBrowserContentHandler.prototype = { startPage = ""; } + // If the user's homepage is about:tor, we do not want to open it twice with + // the override. + if ( + openAboutTor && + startPage === "about:tor" && + overridePage?.split("|").includes("about:tor") + ) { + startPage = ""; + } + // Only show the startPage if we're not restoring an update session and are // not set to skip the start page on this profile if (overridePage && startPage && !willRestoreSession && !skipStartPage) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ac068d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/ac068d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.0esr-15.0-1] fixup! BB 26345: Hide tracking protection UI
by henry (＠henry) 16 Jul '25

16 Jul '25

henry pushed to branch mullvad-browser-140.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 4e104683 by henry at 2025-07-16T18:03:45+01:00 fixup! BB 26345: Hide tracking protection UI TB 43947: Prevent import of ContentBlockingPrefs. (cherry picked from commit ac068db488af00eb389ffe811bb60f450f796157) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 2 changed files: - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/components/BrowserComponents.manifest ===================================== @@ -44,7 +44,6 @@ category browser-first-window-ready resource:///modules/PageActions.sys.mjs Page category browser-first-window-ready resource://gre/modules/DoHController.sys.mjs DoHController.init category browser-first-window-ready moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs ProfilesDatastoreService.init category browser-first-window-ready resource:///modules/profiles/SelectableProfileService.sys.mjs SelectableProfileService.init -category browser-first-window-ready moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs ContentBlockingPrefs.init category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingUtils.sys.mjs CaptchaDetectionPingUtils.init #ifdef MOZ_SANDBOX #ifdef XP_LINUX ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -19,8 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, { BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", - ContentBlockingPrefs: - "moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs", ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.sys.mjs", DAPTelemetrySender: "resource://gre/modules/DAPTelemetrySender.sys.mjs", @@ -575,8 +573,6 @@ BrowserGlue.prototype = { this._gmpInstallManager.uninit(); delete this._gmpInstallManager; } - - lazy.ContentBlockingPrefs.uninit(); }, // runs on startup, before the first command line handler is invoked View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/4e1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/4e1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.0esr-15.0-1] fixup! BB 26345: Hide tracking protection UI
by henry (＠henry) 16 Jul '25

16 Jul '25

henry pushed to branch base-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: ccac8809 by henry at 2025-07-16T17:00:21+00:00 fixup! BB 26345: Hide tracking protection UI TB 43947: Prevent import of ContentBlockingPrefs. (cherry picked from commit ac068db488af00eb389ffe811bb60f450f796157) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 2 changed files: - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/components/BrowserComponents.manifest ===================================== @@ -44,7 +44,6 @@ category browser-first-window-ready resource:///modules/PageActions.sys.mjs Page category browser-first-window-ready resource://gre/modules/DoHController.sys.mjs DoHController.init category browser-first-window-ready moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs ProfilesDatastoreService.init category browser-first-window-ready resource:///modules/profiles/SelectableProfileService.sys.mjs SelectableProfileService.init -category browser-first-window-ready moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs ContentBlockingPrefs.init category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingUtils.sys.mjs CaptchaDetectionPingUtils.init #ifdef MOZ_SANDBOX #ifdef XP_LINUX ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -19,8 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, { BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", - ContentBlockingPrefs: - "moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs", ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.sys.mjs", DAPTelemetrySender: "resource://gre/modules/DAPTelemetrySender.sys.mjs", @@ -575,8 +573,6 @@ BrowserGlue.prototype = { this._gmpInstallManager.uninit(); delete this._gmpInstallManager; } - - lazy.ContentBlockingPrefs.uninit(); }, // runs on startup, before the first command line handler is invoked View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ccac880… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ccac880… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0esr-15.0-1] fixup! BB 26345: Hide tracking protection UI
by henry (＠henry) 16 Jul '25

16 Jul '25

henry pushed to branch tor-browser-140.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: ac068db4 by Henry Wilkes at 2025-07-16T17:51:30+01:00 fixup! BB 26345: Hide tracking protection UI TB 43947: Prevent import of ContentBlockingPrefs. - - - - - 2 changed files: - browser/components/BrowserComponents.manifest - browser/components/BrowserGlue.sys.mjs Changes: ===================================== browser/components/BrowserComponents.manifest ===================================== @@ -45,7 +45,6 @@ category browser-first-window-ready resource:///modules/PageActions.sys.mjs Page category browser-first-window-ready resource://gre/modules/DoHController.sys.mjs DoHController.init category browser-first-window-ready moz-src:///toolkit/profile/ProfilesDatastoreService.sys.mjs ProfilesDatastoreService.init category browser-first-window-ready resource:///modules/profiles/SelectableProfileService.sys.mjs SelectableProfileService.init -category browser-first-window-ready moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs ContentBlockingPrefs.init category browser-first-window-ready resource://gre/modules/CaptchaDetectionPingUtils.sys.mjs CaptchaDetectionPingUtils.init #ifdef MOZ_SANDBOX #ifdef XP_LINUX ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -19,8 +19,6 @@ ChromeUtils.defineESModuleGetters(lazy, { BrowserUtils: "resource://gre/modules/BrowserUtils.sys.mjs", BrowserUsageTelemetry: "resource:///modules/BrowserUsageTelemetry.sys.mjs", BrowserWindowTracker: "resource:///modules/BrowserWindowTracker.sys.mjs", - ContentBlockingPrefs: - "moz-src:///browser/components/protections/ContentBlockingPrefs.sys.mjs", ContextualIdentityService: "resource://gre/modules/ContextualIdentityService.sys.mjs", DAPTelemetrySender: "resource://gre/modules/DAPTelemetrySender.sys.mjs", @@ -582,8 +580,6 @@ BrowserGlue.prototype = { this._gmpInstallManager.uninit(); delete this._gmpInstallManager; } - - lazy.ContentBlockingPrefs.uninit(); }, // runs on startup, before the first command line handler is invoked View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ac068db… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ac068db… You're receiving this email because of your account on gitlab.torproject.org.

1 0