August 2025 - tor-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] fixup! Add CI for Base Browser
by henry (＠henry) 14 Aug '25

14 Aug '25

henry pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: a449b858 by henry at 2025-08-14T16:12:32+00:00 fixup! Add CI for Base Browser TB 44104: Do not run linter when a merge request has no overall change. We also use `\0` to separate file names, rather than `\n`. (cherry picked from commit 87c721a5889b1a2c4ecf9658afe72f78077fe8be) Co-authored-by: Henry Wilkes <henry(a)torproject.org> - - - - - 2 changed files: - .gitlab/ci/jobs/lint/helpers.py - .gitlab/ci/jobs/lint/lint.yml Changes: ===================================== .gitlab/ci/jobs/lint/helpers.py ===================================== @@ -84,6 +84,10 @@ def get_list_of_changed_files(): if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": # For merge requests, the base_reference is the common ancestor between the MR and the target branch base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") + if not base_reference: + # Probably because there has been no overall change. + # See gitlab.com/gitlab-org/gitlab/-/issues/375047#note_2648459916 + return [] else: # When not in merge requests, the base reference is the Firefox tag base_reference = get_firefox_tag(os.getenv("CI_COMMIT_BRANCH")) @@ -118,6 +122,8 @@ if __name__ == "__main__": if args.get_firefox_tag: print(get_firefox_tag(args.get_firefox_tag)) elif args.get_changed_files: - print("\n".join(get_list_of_changed_files())) + # Separate the file names with a 0 byte to be parsed by xargs -0. Also + # drop the trailing '\n'. + print("\0".join(get_list_of_changed_files()), end="") else: print("No valid option provided.") ===================================== .gitlab/ci/jobs/lint/lint.yml ===================================== @@ -18,7 +18,7 @@ lint-all: - firefox script: - ./mach configure --without-wasm-sandboxed-libraries --with-base-browser-version=0.0.0 - - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -d '\n' ./mach lint -v + - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Run job whenever a commit is merged to a protected branch View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a449b85… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a449b85… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! Add CI for Base Browser
by henry (＠henry) 14 Aug '25

14 Aug '25

henry pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 87c721a5 by Henry Wilkes at 2025-08-14T16:11:43+00:00 fixup! Add CI for Base Browser TB 44104: Do not run linter when a merge request has no overall change. We also use `\0` to separate file names, rather than `\n`. - - - - - 2 changed files: - .gitlab/ci/jobs/lint/helpers.py - .gitlab/ci/jobs/lint/lint.yml Changes: ===================================== .gitlab/ci/jobs/lint/helpers.py ===================================== @@ -84,6 +84,10 @@ def get_list_of_changed_files(): if os.getenv("CI_PIPELINE_SOURCE") == "merge_request_event": # For merge requests, the base_reference is the common ancestor between the MR and the target branch base_reference = os.getenv("CI_MERGE_REQUEST_DIFF_BASE_SHA") + if not base_reference: + # Probably because there has been no overall change. + # See gitlab.com/gitlab-org/gitlab/-/issues/375047#note_2648459916 + return [] else: # When not in merge requests, the base reference is the Firefox tag base_reference = get_firefox_tag(os.getenv("CI_COMMIT_BRANCH")) @@ -118,6 +122,8 @@ if __name__ == "__main__": if args.get_firefox_tag: print(get_firefox_tag(args.get_firefox_tag)) elif args.get_changed_files: - print("\n".join(get_list_of_changed_files())) + # Separate the file names with a 0 byte to be parsed by xargs -0. Also + # drop the trailing '\n'. + print("\0".join(get_list_of_changed_files()), end="") else: print("No valid option provided.") ===================================== .gitlab/ci/jobs/lint/lint.yml ===================================== @@ -18,7 +18,7 @@ lint-all: - firefox script: - ./mach configure --without-wasm-sandboxed-libraries --with-base-browser-version=0.0.0 - - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -d '\n' ./mach lint -v + - .gitlab/ci/jobs/lint/helpers.py --get-changed-files | xargs -0 --no-run-if-empty ./mach lint -v rules: - if: $CI_PIPELINE_SOURCE == 'merge_request_event' # Run job whenever a commit is merged to a protected branch View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/87c721a… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/87c721a… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] 3 commits: BB 44040: Modify prompt service for Base Browser.
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: a20941b3 by Henry Wilkes at 2025-08-14T16:05:28+00:00 BB 44040: Modify prompt service for Base Browser. - - - - - babb3f1f by Henry Wilkes at 2025-08-14T16:05:28+00:00 fixup! BB 40925: Implemented the Security Level component TB 44030: Show a warning before restarting the browser when applying a new security level. Also adapt the existing warning to use a destructive button and the button "Restart Tor Browser" rather than just "Restart". - - - - - e094fd1a by Henry Wilkes at 2025-08-14T16:05:29+00:00 fixup! Base Browser strings TB 44030: Add strings for the new security level warning dialog. - - - - - 8 changed files: - browser/components/securitylevel/content/securityLevelDialog.js - browser/modules/SecurityLevelRestartNotification.sys.mjs - netwerk/base/nsIPrompt.idl - toolkit/components/prompts/content/commonDialog.js - toolkit/components/prompts/src/Prompter.sys.mjs - toolkit/components/windowwatcher/nsIPromptService.idl - toolkit/content/widgets/dialog.js - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/components/securitylevel/content/securityLevelDialog.js ===================================== @@ -39,8 +39,8 @@ const gSecurityLevelDialog = { async init() { const dialog = document.getElementById("security-level-dialog"); dialog.addEventListener("dialogaccept", event => { + event.preventDefault(); if (this._acceptButton.disabled) { - event.preventDefault(); return; } this._commitChange(); @@ -158,7 +158,41 @@ const gSecurityLevelDialog = { /** * Commit the change in security level and restart the browser. */ - _commitChange() { + async _commitChange() { + const doNotWarnPref = "browser.security_level.disable_warn_before_restart"; + if (!Services.prefs.getBoolPref(doNotWarnPref, false)) { + const [titleString, bodyString, checkboxString, restartString] = + await document.l10n.formatValues([ + { id: "security-level-restart-warning-dialog-title" }, + { id: "security-level-restart-warning-dialog-body" }, + { id: "restart-warning-dialog-do-not-warn-checkbox" }, + { id: "restart-warning-dialog-restart-button" }, + ]); + const flags = + Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING + + Services.prompt.BUTTON_POS_0_DEFAULT + + Services.prompt.BUTTON_DEFAULT_IS_DESTRUCTIVE + + Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL; + const propBag = await Services.prompt.asyncConfirmEx( + window.browsingContext.top, + Services.prompt.MODAL_TYPE_CONTENT, + titleString, + bodyString, + flags, + restartString, + null, + null, + checkboxString, + false, + { useTitle: true, noIcon: true } + ); + if (propBag.get("buttonNumClicked") !== 0) { + return; + } + if (propBag.get("checked")) { + Services.prefs.setBoolPref(doNotWarnPref, true); + } + } SecurityLevelPrefs.setSecurityLevelBeforeRestart(this._selectedLevel); Services.startup.quit( Services.startup.eAttemptQuit | Services.startup.eRestart ===================================== browser/modules/SecurityLevelRestartNotification.sys.mjs ===================================== @@ -42,11 +42,13 @@ export const SecurityLevelRestartNotification = { await lazy.NotificationStrings.formatValues([ { id: "security-level-restart-prompt-title" }, { id: "security-level-restart-prompt-body" }, - { id: "security-level-restart-prompt-button-restart" }, + { id: "restart-warning-dialog-restart-button" }, { id: "security-level-restart-prompt-button-ignore" }, ]); const buttonFlags = Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 + + Services.prompt.BUTTON_POS_0_DEFAULT + + Services.prompt.BUTTON_DEFAULT_IS_DESTRUCTIVE + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1; const propBag = await Services.prompt.asyncConfirmEx( ===================================== netwerk/base/nsIPrompt.idl ===================================== @@ -67,6 +67,8 @@ interface nsIPrompt : nsISupports const unsigned long BUTTON_POS_1_IS_SECONDARY = 1 << 29; + const unsigned long BUTTON_DEFAULT_IS_DESTRUCTIVE = 1 << 30; + const unsigned long STD_OK_CANCEL_BUTTONS = (BUTTON_TITLE_OK * BUTTON_POS_0) + (BUTTON_TITLE_CANCEL * BUTTON_POS_1); const unsigned long STD_YES_NO_BUTTONS = (BUTTON_TITLE_YES * BUTTON_POS_0) + ===================================== toolkit/components/prompts/content/commonDialog.js ===================================== @@ -39,7 +39,7 @@ function commonDialogOnLoad() { ["promptUserAndPass", "promptPassword"].includes(args.promptType) || args.headerIconCSSValue; let root = document.documentElement; - if (needIconifiedHeader) { + if (needIconifiedHeader && !args.noIcon) { root.setAttribute("neediconheader", "true"); } let title = { raw: args.title }; @@ -107,6 +107,10 @@ function commonDialogOnLoad() { dialog.setAttribute("extra1-is-secondary", true); } + if (args.isDefaultDestructive) { + dialog.setAttribute("default-is-destructive", true); + } + Dialog = new CommonDialog(args, ui); window.addEventListener("dialogclosing", function (aEvent) { if (aEvent.detail?.abort) { ===================================== toolkit/components/prompts/src/Prompter.sys.mjs ===================================== @@ -1507,6 +1507,10 @@ class ModalPrompter { args.isExtra1Secondary = true; } + if (flags & Ci.nsIPrompt.BUTTON_DEFAULT_IS_DESTRUCTIVE) { + args.isDefaultDestructive = true; + } + if (flags & Ci.nsIPrompt.SHOW_SPINNER) { args.headerIconCSSValue = "url('chrome://global/skin/icons/loading.svg')"; } ===================================== toolkit/components/windowwatcher/nsIPromptService.idl ===================================== @@ -287,6 +287,8 @@ interface nsIPromptService : nsISupports */ const unsigned long BUTTON_POS_1_IS_SECONDARY = 1 << 29; + const unsigned long BUTTON_DEFAULT_IS_DESTRUCTIVE = 1 << 30; + /** * Selects the standard set of OK/Cancel buttons. */ ===================================== toolkit/content/widgets/dialog.js ===================================== @@ -21,7 +21,8 @@ static get observedAttributes() { return super.observedAttributes.concat( "subdialog", - "extra1-is-secondary" + "extra1-is-secondary", + "default-is-destructive" ); } @@ -40,6 +41,12 @@ if (name === "extra1-is-secondary" && AppConstants.XP_UNIX) { this.getButton("cancel").after(this.getButton("extra1")); } + if (name === "default-is-destructive") { + this.#setButtonIsDestructive( + this.getButton(this.defaultButton), + this.hasAttribute("default-is-destructive") + ); + } super.attributeChangedCallback(name, oldValue, newValue); } @@ -491,12 +498,17 @@ var oldDefaultButton = this.getButton(this.defaultButton); if (oldDefaultButton) { oldDefaultButton.removeAttribute("default"); + this.#setButtonIsDestructive(oldDefaultButton, false); } var newDefaultButton = this.getButton(aNewDefault); if (newDefaultButton) { this.setAttribute("defaultButton", aNewDefault); newDefaultButton.setAttribute("default", "true"); + this.#setButtonIsDestructive( + newDefaultButton, + this.hasAttribute("default-is-destructive") + ); } else { this.setAttribute("defaultButton", "none"); if (aNewDefault != "none") { @@ -507,6 +519,16 @@ } } + /** + * Mark or un-mark a button as a destructive action. + * + * @param {?Element} button - The button to mark. + * @param {boolean} isDestructive - Whether the button is destructive. + */ + #setButtonIsDestructive(button, isDestructive) { + button?.classList.toggle("danger-button", isDestructive); + } + _handleButtonCommand(aEvent) { return this._doButtonCommand(aEvent.target.getAttribute("dlgtype")); } ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -177,6 +177,13 @@ security-level-preferences-bullet-limit-media = Audio and video (HTML5 media), a security-level-preferences-bullet-disabled-javascript = JavaScript is disabled by default on all sites. security-level-preferences-bullet-limit-font-and-symbols-and-images = Some fonts, icons, math symbols, and images are disabled. +## Security level dialog warning the user about a restart. + +# '-brand-short-name' is the localized browser name, like "Tor Browser". +security-level-restart-warning-dialog-title = Restart { -brand-short-name } to apply changes? +# '-brand-short-name' is the localized browser name, like "Tor Browser". +security-level-restart-warning-dialog-body = { -brand-short-name } needs to restart to apply your changes. This will close all your windows and tabs. + ## Custom security level. ## Some custom preferences configuration has placed the user outside one of the standard three levels. @@ -188,5 +195,12 @@ security-level-summary-custom = Your custom browser preferences have resulted in security-level-restart-prompt-title = Your security level settings require a restart security-level-restart-prompt-body = You must restart { -brand-short-name } for your security level settings to be applied. This will close all your windows and tabs. -security-level-restart-prompt-button-restart = Restart security-level-restart-prompt-button-ignore = Ignore + +## Part of the restart dialogs for security level and new identity. + +# Checkbox to never show the restart warning dialog again. +restart-warning-dialog-do-not-warn-checkbox = Don’t show this warning again +# Button to restart the browser. +# '-brand-short-name' is the localized browser name, like "Tor Browser". +restart-warning-dialog-restart-button = Restart { -brand-short-name } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fcff0e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/fcff0e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 3 commits: BB 44040: Modify prompt service for Base Browser.
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: f8a14cb0 by Henry Wilkes at 2025-08-14T15:15:39+00:00 BB 44040: Modify prompt service for Base Browser. - - - - - 229a213f by Henry Wilkes at 2025-08-14T15:15:40+00:00 fixup! BB 40925: Implemented the Security Level component TB 44030: Show a warning before restarting the browser when applying a new security level. Also adapt the existing warning to use a destructive button and the button "Restart Tor Browser" rather than just "Restart". - - - - - d875c9bb by Henry Wilkes at 2025-08-14T15:15:40+00:00 fixup! Base Browser strings TB 44030: Add strings for the new security level warning dialog. - - - - - 8 changed files: - browser/components/securitylevel/content/securityLevelDialog.js - browser/modules/SecurityLevelRestartNotification.sys.mjs - netwerk/base/nsIPrompt.idl - toolkit/components/prompts/content/commonDialog.js - toolkit/components/prompts/src/Prompter.sys.mjs - toolkit/components/windowwatcher/nsIPromptService.idl - toolkit/content/widgets/dialog.js - toolkit/locales/en-US/toolkit/global/base-browser.ftl Changes: ===================================== browser/components/securitylevel/content/securityLevelDialog.js ===================================== @@ -39,8 +39,8 @@ const gSecurityLevelDialog = { async init() { const dialog = document.getElementById("security-level-dialog"); dialog.addEventListener("dialogaccept", event => { + event.preventDefault(); if (this._acceptButton.disabled) { - event.preventDefault(); return; } this._commitChange(); @@ -158,7 +158,41 @@ const gSecurityLevelDialog = { /** * Commit the change in security level and restart the browser. */ - _commitChange() { + async _commitChange() { + const doNotWarnPref = "browser.security_level.disable_warn_before_restart"; + if (!Services.prefs.getBoolPref(doNotWarnPref, false)) { + const [titleString, bodyString, checkboxString, restartString] = + await document.l10n.formatValues([ + { id: "security-level-restart-warning-dialog-title" }, + { id: "security-level-restart-warning-dialog-body" }, + { id: "restart-warning-dialog-do-not-warn-checkbox" }, + { id: "restart-warning-dialog-restart-button" }, + ]); + const flags = + Services.prompt.BUTTON_POS_0 * Services.prompt.BUTTON_TITLE_IS_STRING + + Services.prompt.BUTTON_POS_0_DEFAULT + + Services.prompt.BUTTON_DEFAULT_IS_DESTRUCTIVE + + Services.prompt.BUTTON_POS_1 * Services.prompt.BUTTON_TITLE_CANCEL; + const propBag = await Services.prompt.asyncConfirmEx( + window.browsingContext.top, + Services.prompt.MODAL_TYPE_CONTENT, + titleString, + bodyString, + flags, + restartString, + null, + null, + checkboxString, + false, + { useTitle: true, noIcon: true } + ); + if (propBag.get("buttonNumClicked") !== 0) { + return; + } + if (propBag.get("checked")) { + Services.prefs.setBoolPref(doNotWarnPref, true); + } + } SecurityLevelPrefs.setSecurityLevelBeforeRestart(this._selectedLevel); Services.startup.quit( Services.startup.eAttemptQuit | Services.startup.eRestart ===================================== browser/modules/SecurityLevelRestartNotification.sys.mjs ===================================== @@ -42,11 +42,13 @@ export const SecurityLevelRestartNotification = { await lazy.NotificationStrings.formatValues([ { id: "security-level-restart-prompt-title" }, { id: "security-level-restart-prompt-body" }, - { id: "security-level-restart-prompt-button-restart" }, + { id: "restart-warning-dialog-restart-button" }, { id: "security-level-restart-prompt-button-ignore" }, ]); const buttonFlags = Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_0 + + Services.prompt.BUTTON_POS_0_DEFAULT + + Services.prompt.BUTTON_DEFAULT_IS_DESTRUCTIVE + Services.prompt.BUTTON_TITLE_IS_STRING * Services.prompt.BUTTON_POS_1; const propBag = await Services.prompt.asyncConfirmEx( ===================================== netwerk/base/nsIPrompt.idl ===================================== @@ -67,6 +67,8 @@ interface nsIPrompt : nsISupports const unsigned long BUTTON_POS_1_IS_SECONDARY = 1 << 29; + const unsigned long BUTTON_DEFAULT_IS_DESTRUCTIVE = 1 << 30; + const unsigned long STD_OK_CANCEL_BUTTONS = (BUTTON_TITLE_OK * BUTTON_POS_0) + (BUTTON_TITLE_CANCEL * BUTTON_POS_1); const unsigned long STD_YES_NO_BUTTONS = (BUTTON_TITLE_YES * BUTTON_POS_0) + ===================================== toolkit/components/prompts/content/commonDialog.js ===================================== @@ -39,7 +39,7 @@ function commonDialogOnLoad() { ["promptUserAndPass", "promptPassword"].includes(args.promptType) || args.headerIconCSSValue; let root = document.documentElement; - if (needIconifiedHeader) { + if (needIconifiedHeader && !args.noIcon) { root.setAttribute("neediconheader", "true"); } let title = { raw: args.title }; @@ -107,6 +107,10 @@ function commonDialogOnLoad() { dialog.setAttribute("extra1-is-secondary", true); } + if (args.isDefaultDestructive) { + dialog.setAttribute("default-is-destructive", true); + } + Dialog = new CommonDialog(args, ui); window.addEventListener("dialogclosing", function (aEvent) { if (aEvent.detail?.abort) { ===================================== toolkit/components/prompts/src/Prompter.sys.mjs ===================================== @@ -1507,6 +1507,10 @@ class ModalPrompter { args.isExtra1Secondary = true; } + if (flags & Ci.nsIPrompt.BUTTON_DEFAULT_IS_DESTRUCTIVE) { + args.isDefaultDestructive = true; + } + if (flags & Ci.nsIPrompt.SHOW_SPINNER) { args.headerIconCSSValue = "url('chrome://global/skin/icons/loading.svg')"; } ===================================== toolkit/components/windowwatcher/nsIPromptService.idl ===================================== @@ -287,6 +287,8 @@ interface nsIPromptService : nsISupports */ const unsigned long BUTTON_POS_1_IS_SECONDARY = 1 << 29; + const unsigned long BUTTON_DEFAULT_IS_DESTRUCTIVE = 1 << 30; + /** * Selects the standard set of OK/Cancel buttons. */ ===================================== toolkit/content/widgets/dialog.js ===================================== @@ -21,7 +21,8 @@ static get observedAttributes() { return super.observedAttributes.concat( "subdialog", - "extra1-is-secondary" + "extra1-is-secondary", + "default-is-destructive" ); } @@ -40,6 +41,12 @@ if (name === "extra1-is-secondary" && AppConstants.XP_UNIX) { this.getButton("cancel").after(this.getButton("extra1")); } + if (name === "default-is-destructive") { + this.#setButtonIsDestructive( + this.getButton(this.defaultButton), + this.hasAttribute("default-is-destructive") + ); + } super.attributeChangedCallback(name, oldValue, newValue); } @@ -491,12 +498,17 @@ var oldDefaultButton = this.getButton(this.defaultButton); if (oldDefaultButton) { oldDefaultButton.removeAttribute("default"); + this.#setButtonIsDestructive(oldDefaultButton, false); } var newDefaultButton = this.getButton(aNewDefault); if (newDefaultButton) { this.setAttribute("defaultButton", aNewDefault); newDefaultButton.setAttribute("default", "true"); + this.#setButtonIsDestructive( + newDefaultButton, + this.hasAttribute("default-is-destructive") + ); } else { this.setAttribute("defaultButton", "none"); if (aNewDefault != "none") { @@ -507,6 +519,16 @@ } } + /** + * Mark or un-mark a button as a destructive action. + * + * @param {?Element} button - The button to mark. + * @param {boolean} isDestructive - Whether the button is destructive. + */ + #setButtonIsDestructive(button, isDestructive) { + button?.classList.toggle("danger-button", isDestructive); + } + _handleButtonCommand(aEvent) { return this._doButtonCommand(aEvent.target.getAttribute("dlgtype")); } ===================================== toolkit/locales/en-US/toolkit/global/base-browser.ftl ===================================== @@ -177,6 +177,13 @@ security-level-preferences-bullet-limit-media = Audio and video (HTML5 media), a security-level-preferences-bullet-disabled-javascript = JavaScript is disabled by default on all sites. security-level-preferences-bullet-limit-font-and-symbols-and-images = Some fonts, icons, math symbols, and images are disabled. +## Security level dialog warning the user about a restart. + +# '-brand-short-name' is the localized browser name, like "Tor Browser". +security-level-restart-warning-dialog-title = Restart { -brand-short-name } to apply changes? +# '-brand-short-name' is the localized browser name, like "Tor Browser". +security-level-restart-warning-dialog-body = { -brand-short-name } needs to restart to apply your changes. This will close all your windows and tabs. + ## Custom security level. ## Some custom preferences configuration has placed the user outside one of the standard three levels. @@ -188,5 +195,12 @@ security-level-summary-custom = Your custom browser preferences have resulted in security-level-restart-prompt-title = Your security level settings require a restart security-level-restart-prompt-body = You must restart { -brand-short-name } for your security level settings to be applied. This will close all your windows and tabs. -security-level-restart-prompt-button-restart = Restart security-level-restart-prompt-button-ignore = Ignore + +## Part of the restart dialogs for security level and new identity. + +# Checkbox to never show the restart warning dialog again. +restart-warning-dialog-do-not-warn-checkbox = Don’t show this warning again +# Button to restart the browser. +# '-brand-short-name' is the localized browser name, like "Tor Browser". +restart-warning-dialog-restart-button = Restart { -brand-short-name } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/283e83… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/283e83… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] 2 commits: fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 617b0965 by Morgan at 2025-08-14T15:53:36+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates update branch creation section now that we have tags from the firefox repo - - - - - 8c38535c by Morgan at 2025-08-14T15:54:07+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates Update priority labels - - - - - 4 changed files: - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/090 Emergency Security Issue.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -43,6 +43,7 @@ - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` + - If you copied and pasted from old rules, double check you didn't add spaces at the end, as GitLab will not trim them! ### **Create and Push New Branch** @@ -93,4 +94,4 @@ /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/061 Rebase - Stable.md ===================================== @@ -93,4 +93,4 @@ /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/063 Rebase - Rapid.md ===================================== @@ -90,4 +90,4 @@ /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::High" +/label ~"Priority::High" ===================================== .gitlab/issue_templates/090 Emergency Security Issue.md ===================================== @@ -94,5 +94,5 @@ Godspeed! :pray: /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Bug" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" /label ~"Emergency" View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/43… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/43… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] 2 commits: fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: c3f7c668 by Morgan at 2025-08-14T15:36:08+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates update branch creation section now that we have tags from the firefox repo - - - - - fcff0e12 by Morgan at 2025-08-14T15:36:15+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates Update priority labels - - - - - 4 changed files: - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/090 Emergency Security Issue.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -45,17 +45,8 @@ ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(ESR_TAG)` - - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release - - Otherwise: - - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags` - - [ ] Find and inspect the commit tagged with `$(ESR_TAG)` - - Tags are in yellow in the Mercurial web UI - - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)` - - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`) - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead - - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"` -- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} +- [ ] Create new alpha `base-browser` branch from Firefox ${ESR_TAG} - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.5-1` - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag @@ -160,4 +151,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/061 Rebase - Stable.md ===================================== @@ -42,15 +42,7 @@ ### **Identify the Firefox Tagged Commit and Create New Branches** -- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags - - **Example**: `FIREFOX_102_8_0esr_BUILD1` -- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev - - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr102` branch to find the equivalent commit - - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845` -- [ ] Sign and Tag `gecko-dev` commit - - Sign/Tag `gecko-dev` commit : - - **Tag**: `$(ESR_TAG)` - - **Message**: `Hg tag $(ESR_TAG)` +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} - [ ] Create new stable `base-browser` branch from tag - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.0-1` @@ -122,4 +114,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/063 Rebase - Rapid.md ===================================== @@ -138,15 +138,8 @@ gitGraph: ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(NIGHTLY_TAG)` - - Go to https://hg.mozilla.org/mozilla-central/tags - - Find and inspect the commit tagged with `$(NIGHTLY_TAG)` - - Tags are in yellow in the Mercurial web UI - - Find the equivalent commit in https://github.com/mozilla/gecko-dev/commits/master - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/master` locally, instead - - Using the differential revision link is useful to quickly find the git commit - - Sign/Tag the `gecko-dev` commit: `git tag -as $(NIGHTLY_TAG) $(GIT_HASH) -m "Hg tag $(NIGHTLY_TAG)"` -- [ ] Create two new rapid `tor-browser` branches from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${NIGHTLY_TAG} +- [ ] Create two new rapid `tor-browser` branches from Firefox ${NIGHTLY_TAG} - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}` - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2` - [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream` @@ -297,4 +290,4 @@ gitGraph: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::High" +/label ~"Priority::High" ===================================== .gitlab/issue_templates/090 Emergency Security Issue.md ===================================== @@ -101,5 +101,5 @@ Godspeed! :pray: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Bug" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" /label ~"Emergency" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0f93b8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0f93b8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 6 commits: fixup! BB 43615: Add Gitlab Issue and Merge Request templates
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 3aa641b8 by Morgan at 2025-08-14T15:08:44+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates update branch creation section now that we have tags from the firefox repo - - - - - c5096579 by Morgan at 2025-08-14T15:08:45+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates update the triage issue to be a general review issue; include release notes in review - - - - - 0b374a60 by Morgan at 2025-08-14T15:08:46+00:00 fixup! BB 43615: Add Gitlab Issue and Merge Request templates Update priority labels - - - - - ccf4f67e by Morgan at 2025-08-14T15:08:46+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates Update priority labels - - - - - f69cb535 by Morgan at 2025-08-14T15:08:46+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates add Tor Browser 16.0 milestone to the firefox review - - - - - 283e83c9 by Morgan at 2025-08-14T15:08:47+00:00 fixup! TB 43616: Customize Gitlab Issue and Merge Request templates - - - - - 11 changed files: - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/062 Rebase - Legacy.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/080 Security Backports.md - .gitlab/issue_templates/090 Emergency Security Issue.md - .gitlab/issue_templates/100 Release QA - Desktop.md - .gitlab/issue_templates/101 Release QA - Android.md - .gitlab/issue_templates/110 Bugzilla Triage.md → .gitlab/issue_templates/110 Firefox Release Review.md - .gitlab/issue_templates/120 Bugzilla Audit.md - .gitlab/issue_templates/Default.md Changes: ===================================== .gitlab/issue_templates/060 Rebase - Alpha.md ===================================== @@ -36,8 +36,8 @@ - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous alpha `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - **Example**: `*-102.8.0esr-12.5-1*` + - **Branch**: `(tor|base)-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - **Example**: `(tor|base)-browser-102.8.0esr-12.5-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` @@ -45,17 +45,8 @@ ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(ESR_TAG)` - - If `$(BROWSER_MINOR)` is 5, the tag should already exist from the stable release - - Otherwise: - - [ ] Go to `https://hg.mozilla.org/releases/mozilla-esr$(ESR_MAJOR)/tags` - - [ ] Find and inspect the commit tagged with `$(ESR_TAG)` - - Tags are in yellow in the Mercurial web UI - - [ ] Find the equivalent commit in `https://github.com/mozilla/gecko-dev/commits/esr$(ESR_MAJOR)` - - The tag should be very close to `HEAD` (usually the second, before a `No bug - Tagging $(HG_HASH) with $(ESR_TAG)`) - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/esr$(ESR_MAJOR)` locally, instead - - [ ] Sign/Tag the `gecko-dev` commit: `git tag -as $(ESR_TAG) $(GIT_HASH) -m "Hg tag $(ESR_TAG)"` -- [ ] Create new alpha `base-browser` branch from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} +- [ ] Create new alpha `base-browser` branch from Firefox ${ESR_TAG} - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.5-1` - [ ] Create new alpha `tor-browser` branch from Firefox mercurial tag @@ -160,4 +151,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/061 Rebase - Stable.md ===================================== @@ -34,23 +34,15 @@ - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous stable `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `*-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` - - **Example**: `*-102.8.0esr-12.0-1*` + - **Branch**: `(tor|base)-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1*` + - **Example**: `(tor|base)-browser-102.8.0esr-12.0-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` ### **Identify the Firefox Tagged Commit and Create New Branches** -- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags - - **Example**: `FIREFOX_102_8_0esr_BUILD1` -- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev - - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr102` branch to find the equivalent commit - - **Example**: `3a3a96c9eedd02296d6652dd50314fccbc5c4845` -- [ ] Sign and Tag `gecko-dev` commit - - Sign/Tag `gecko-dev` commit : - - **Tag**: `$(ESR_TAG)` - - **Message**: `Hg tag $(ESR_TAG)` +- [ ] Fetch Mozilla's firefox repo and identify this release's ${ESR_TAG} - [ ] Create new stable `base-browser` branch from tag - Branch name in the form: `base-browser-$(ESR_VERSION)esr-$(BROWSER_MAJOR).$(BROWSER_MINOR)-1` - **Example**: `base-browser-102.8.0esr-12.0-1` @@ -122,4 +114,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/062 Rebase - Legacy.md ===================================== @@ -29,31 +29,19 @@ - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous legacy `base-browser` and `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `base-browser` and `tor-browser` branch protection rule: - - **Branch**: `*-$(ESR_VERSION)esr-13.5-1*` - - **Example**: `*-115.18.0esr-13.5-1*` + - [ ] Create new `tor-browser` branch protection rule: + - **Branch**: `tor-browser-$(ESR_VERSION)esr-13.5-1*` + - **Example**: `tor-browser-115.18.0esr-13.5-1*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` ### **Identify the Firefox Tagged Commit and Create New Branches** -- [ ] Find the Firefox mercurial tag here: https://hg.mozilla.org/releases/mozilla-esr102/tags - - **Example**: `FIREFOX_115_18_0esr_BUILD1` -- [ ] Find the analogous `gecko-dev` commit: https://github.com/mozilla/gecko-dev - - **Tip**: Search for unique string (like the Differential Revision ID) found in the mercurial commit in the `gecko-dev/esr115` branch to find the equivalent commit - - **Example**: `293d490d2e8d9fbb91c76336288f1287cbe285fb` -- [ ] Sign and Tag `gecko-dev` commit - - Sign/Tag `gecko-dev` commit : - - **Tag**: `$(ESR_TAG)` - - **Message**: `Hg tag $(ESR_TAG)` -- [ ] Create new legacy `base-browser` branch from tag - - Branch name in the form: `base-browser-$(ESR_VERSION)esr-13.5-1` - - **Example**: `base-browser-115.18.0esr-13.5-1` +- [ ] Fetch Mozilla's firefox repo and identify this release's ESR-115 ${ESR_TAG} - [ ] Create new legacy `tor-browser` branch from - Branch name in the form: `tor-browser-$(ESR_VERSION)esr-13.5-1` - **Example**: `tor-browser-115.18.0esr-13.5-1` -- [ ] Push new `base-browser` branch to `upstream` - [ ] Push new `tor-browser` branch to `upstream` - [ ] Push new `$(ESR_TAG)` to `upstream` @@ -61,22 +49,13 @@ - [ ] Checkout a new local branch for the `tor-browser` rebase - **Example**: `git branch tor-browser-rebase FIREFOX_115_18_0esr_BUILD1` -- [ ] **(Optional)** `base-browser` rebase - - **NOTE** This step may be skipped if the `HEAD` of the previous `base-browser` branch is a `-buildN` tag - - [ ] Cherry-pick the previous `base-browser` commits up to `base-browser`'s `buildN` tag onto new `base-browser` rebase branch - - **Example**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..base-browser-115.17.0esr-13.5-1-build2` - - [ ] Rebase and autosquash these cherry-picked commits - - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1 HEAD` - - [ ] Cherry-pick remainder of patches after the `buildN` tag - - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build21..upstream/base-browser-115.17.0esr-13.5-1` - [ ] `tor-browser` rebase - [ ] Note the current git hash of `HEAD` for `tor-browser` rebase+autosquash step: `git rev-parse HEAD` - - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `buildN` tag - - **Example**: `git cherry-pick base-browser-115.17.0esr-13.5-1-build1..tor-browser-115.17.0esr-13.5-1-build2 - - **Example (if separate base-browser rebase was skipped)**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..tor-browser-115.17.0esr-13.5-1-build2` + - [ ] Cherry-pick the appropriate previous `tor-browser` branch's commit range up to the last `tor-browser` `build1` tag + - **Example**: `git cherry-pick FIREFOX_115_17_0esr_BUILD1..tor-browser-115.17.0esr-13.5-1-build2` - [ ] Rebase and autosquash these newly cherry-picked commits: `git rebase --autosquash --interactive $(PREV_HEAD)` - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` - - [ ] Cherry-pick remainder of patches after the last `tor-browser` `buildN` tag + - [ ] Cherry-pick remainder of patches after the last `tor-browser` `build1` tag - **Example**: `git cherry-pick tor-browser-115.17.0esr-13.5-1-build1..upstream/tor-browser-115.17.0esr-13.5-1` - [ ] Rebase and autosquash again, this time replacing all `fixup` and `squash` commands with `pick`. The goal here is to have all of the `fixup` and `squash` commits beside the commit which they modify, but kept un-squashed for easy debugging/bisecting. - **Example**: `git rebase --autosquash --interactive FIREFOX_115_18_0esr_BUILD1` @@ -86,14 +65,11 @@ - `git diff $(ESR_TAG_PREV)..$(BROWSER_BRANCH_PREV) > current_patchset.diff` - `git diff $(ESR_TAG)..$(BROWSER_BRANCH) > rebased_patchset.diff` - diff `current_patchset.diff` and `rebased_patchset.diff` - - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` (unless the previous `base-browser` branch includes changes not included in the previous `tor-browser` branch) + - If everything went correctly, the only lines which should differ should be the lines starting with `index abc123...def456` - [ ] rangediff: `git range-diff $(ESR_TAG_PREV)..$(TOR_BROWSER_BRANCH_PREV) $(ESR_TAG)..HEAD` - **Example**: `git range-dif FIREFOX_115_17_0esr_BUILD1..upstream/tor-browser-115.17.0esr-13.5-1 FIREFOX_115_18_0esr_BUILD1..HEAD` - [ ] Open MR for the `tor-browser` rebase - [ ] Merge -- Update and push `base-browser` branch - - [ ] Reset the new `base-browser` branch to the appropriate commit in this new `tor-browser` branch - - [ ] Push these commits to `upstream` ### **Sign and Tag** @@ -104,13 +80,6 @@ ./tools/browser/sign-tag.torbrowser legacy build1 ``` - [ ] Push tag to `upstream` -- [ ] Sign/Tag HEAD of the merged `base-browser` branch: - - In **tor-browser.git**, checkout the new legacy `base-browser` branch - - In **tor-browser-build.git**, run signing script: - ```bash - ./tools/browser/sign-tag.basebrowser legacy build1 - ``` - - [ ] Push tag to `upstream`  @@ -118,4 +87,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/063 Rebase - Rapid.md ===================================== @@ -128,9 +128,9 @@ gitGraph: - [ ] In [Repository Settings](https://gitlab.torproject.org/tpo/applications/tor-browser/-/sett…: - [ ] Remove previous nightly `tor-browser` branch protection rules (this will prevent pushing new changes to the branches being rebased) - - [ ] Create new `tor-browser` branch protection rule: - - **Branch**: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-*` - - **Example**: `tor-browser-130.0a1-15.0-*` + - [ ] Create new `base-browser` and `tor-browser` branch protection rule: + - **Branch**: `(tor|base)-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-*` + - **Example**: `(tor|base)-browser-130.0a1-15.0-*` - **Allowed to merge**: `Maintainers` - **Allowed to push and merge**: `Maintainers` - **Allowed to force push**: `false` @@ -138,15 +138,8 @@ gitGraph: ### **Create New Branches** -- [ ] Find the Firefox mercurial tag `$(NIGHTLY_TAG)` - - Go to https://hg.mozilla.org/mozilla-central/tags - - Find and inspect the commit tagged with `$(NIGHTLY_TAG)` - - Tags are in yellow in the Mercurial web UI - - Find the equivalent commit in https://github.com/mozilla/gecko-dev/commits/master - - **Notice**: GitHub sorts commits by time, you might want to use `git log gecko-dev/master` locally, instead - - Using the differential revision link is useful to quickly find the git commit - - Sign/Tag the `gecko-dev` commit: `git tag -as $(NIGHTLY_TAG) $(GIT_HASH) -m "Hg tag $(NIGHTLY_TAG)"` -- [ ] Create two new rapid `tor-browser` branches from Firefox mercurial tag +- [ ] Fetch Mozilla's firefox repo and identify this release's ${NIGHTLY_TAG} +- [ ] Create two new rapid `tor-browser` branches from Firefox ${NIGHTLY_TAG} - Branch name in the form: `tor-browser-$(NIGHTLY_VERSION)-$(BROWSER_VERSION)-${BRANCH_NUM}` - **Example**: `tor-browser-130.0a1-15.0-1` and `tor-browser-130.0a1-15.0-2` - [ ] Push new `tor-browser` branches and the `firefox` tag to `upstream` @@ -297,4 +290,4 @@ gitGraph: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Rebase" -/label ~"Apps::Priority::High" +/label ~"Priority::High" ===================================== .gitlab/issue_templates/080 Security Backports.md ===================================== @@ -84,4 +84,4 @@ /label ~"Apps::Product::TorBrowser" /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Backport" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/090 Emergency Security Issue.md ===================================== @@ -101,5 +101,5 @@ Godspeed! :pray: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Product::MullvadBrowser" /label ~"Apps::Type::Bug" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" /label ~"Emergency" ===================================== .gitlab/issue_templates/100 Release QA - Desktop.md ===================================== @@ -209,4 +209,4 @@ Please lay claim to a platform in the comments: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Test" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/101 Release QA - Android.md ===================================== @@ -104,4 +104,4 @@ Architectures: /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Test" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/110 Bugzilla Triage.md → .gitlab/issue_templates/110 Firefox Release Review.md ===================================== @@ -1,11 +1,13 @@ -# 📋 Bugzilla Triage +# 📋 Firefox Release Review **NOTE** This issue presumes the branches and tags for the next Firefox release have already been created in tor-browser.git +## Bugzilla Triage + - [ ] Generate Bugzilla triage CSV - Run (from `tor-browser-build` root): ```bash - ./tools/browser/generate-bugzilla-triage-csv ${FIREFOX_VERSION} ${PREVIOUS_NIGHTLY_TAG} ${NEXT_NIGHLTY_TAG} ${TRIAGE_ISSUE_NUMBER} ${REVIEWERS} > out.csv + ./tools/browser/generate-bugzilla-triage-csv ${FIREFOX_VERSION} ${PREVIOUS_NIGHTLY_TAG} ${NEXT_NIGHLTY_TAG} ${TRIAGE_ISSUE_NUMBER} > out.csv ``` - `${FIREFOX_VERSION}`: the major Firefox version of the nightly to review - **Example**: 129 @@ -15,42 +17,50 @@ - **Example**: `FIREFOX_NIGHTLY_129_END` - `${TRIAGE_ISSUE_NUMBER}`: this `tor-browser` issue - **Example**: `43303` - - `${REVIEWERS}`: `morgan` and two additional devs to triage this Firefox version - - `boklm` - - `brizental` - - `clairehurst` - - `dan` - - `henry` - - `jwilde` - - `ma1` - - `pierov` - **Example**: ```bash - ./tools/browser/generate-bugzilla-triage-csv 129 FIREFOX_NIGHTLY_128_END FIREFOX_NIGHTLY_129_END 43303 morgan pierov henry > 129.csv + ./tools/browser/generate-bugzilla-triage-csv 129 FIREFOX_NIGHTLY_128_END FIREFOX_NIGHTLY_129_END 43303 > 129.csv ``` - [ ] Attach the generated CSV file to the triage isssue - [ ] Import to Google Sheets ( https://sheets.google.com ) - - [ ] Create blank spreadsheet - - [ ] **Title**: `Bugzilla Triage ${VERSION}` - - [ ] Import CSV: File > Import > Upload + - Create blank spreadsheet + - **Title**: `Bugzilla Triage ${VERSION}` + - Import CSV: File > Import > Upload - **Import location**: "Replace spreadsheet" - **Separator type**: "Comma" - **Convert text to numbers, dates, and fomulas**: "✅" - - [ ] Convert 'Review' column's issue cells to check-boxes: + - Convert 'Review' column's issue cells to check-boxes: - Select relevant cells (i.e.: `A2:A1554` for in the 129 triage) - Insert > Checkbox - - [ ] Convert 'Triaged by' cells to check-boxes - - [ ] Share Spreadsheet + - Convert 'Triaged by' cells to check-boxes + - Share Spreadsheet - 🔒 Share > General access - Change `Restricted` to `Anyone with the link` - Post link in an internal note on this issue -- [ ] Page requested reviewers to this issue -- [ ] Triage Completed by: - - [ ] morgan +- [ ] Assign requested reviewers to this issue + +## Release Notes Review + + + +- [ ] Release Notes for Users (often includes multiple point releases): + - https://www.mozilla.org/en-US/firefox/${FIREFOX_VERSION}/releasenotes/ +- [ ] Release Notes for Developers + - https://developer.mozilla.org/en-US/docs/Mozilla/Firefox/Releases/${FIREFOX… + +--- + +- Bugzilla Triage and Release Notes Review Completed by: +  - [ ] reviewer 1  - [ ] reviewer 2  + - [ ] reviewer 3  -/label ~"esr-140" /label ~"Apps::Product::TorBrowser" -/label ~"Apps::Type::Audit" -/label ~"Apps::Priority::Blocker" +/label ~"Apps::Type::Triage" +/label ~"Priority::Blocker" +/milestone %"Tor Browser 16.0" ===================================== .gitlab/issue_templates/120 Bugzilla Audit.md ===================================== @@ -18,4 +18,4 @@ Title: /label ~"esr-140" /label ~"Apps::Product::TorBrowser" /label ~"Apps::Type::Audit" -/label ~"Apps::Priority::Blocker" +/label ~"Priority::Blocker" ===================================== .gitlab/issue_templates/Default.md ===================================== @@ -23,5 +23,5 @@ Please select the appropriate issue template from the **Description** drop-down. - 🚨 **Emergency Security Issue** - manage fixing and publishing a critical security fix - ✅ **Release QA - Desktop** - test and verify functionality of our Desktop release - ✅ **Release QA - Android** - test and verify functionality of our Android release -- 📋 **Bugzilla Triage** - identify upstream Firefox issues which need to be audited +- 📋 **Firefox Release Review** - identify upstream Firefox issues which need to be audited - 🔍 **Bugzilla Audit** - determine if/how an upstream change affects the browser View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2e5205… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/2e5205… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! [android] Modify build system
by Pier Angelo Vendrame (＠pierov) 14 Aug '25

14 Aug '25

Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 2e520528 by Pier Angelo Vendrame at 2025-08-14T16:20:38+02:00 fixup! [android] Modify build system TB 43799: Check we passed the objdir to tba-sign-devbuilds.sh. When we initially created tba-sign-devbuilds.sh, it was easy to find the APKs. However, after Bug 1951190, they are inside the obj-* directory, which can be customized in mozconfig. So, the easiest way to deal with this, was to ask the caller to provide that obj directory. Not passing it will very likely make the script fail, so with this commit we added a check to output a more meaningful error message. - - - - - 1 changed file: - mobile/android/fenix/tools/tba-sign-devbuilds.sh Changes: ===================================== mobile/android/fenix/tools/tba-sign-devbuilds.sh ===================================== @@ -3,6 +3,10 @@ cd "$(dirname $(realpath "$0"))/.." objdir=$1 +if [ -z "$objdir" ]; then + echo "Usage $0 objdir" + exit 1 +fi if [ -z "$APKSIGNER_ARGS" ]; then if [ -z "$QA_KEY" ]; then View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e52052… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/2e52052… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] BB 44103: Remove ref-names from attr's .git_archival.txt.
by Pier Angelo Vendrame (＠pierov) 14 Aug '25

14 Aug '25

Pier Angelo Vendrame pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 0f93b817 by Pier Angelo Vendrame at 2025-08-14T16:15:42+02:00 BB 44103: Remove ref-names from attr's .git_archival.txt. The currently vendored copy of python-attrs's .git_archival.txt includes a ref-names field which might make source tarballs not reproducible. Upstream fixed this in da2333cd37747d692d5c78b0c94bd400ff883a9a, therefore we apply the same change until Mozilla vendors an updated copy of python-attrs. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1980103. - - - - - 1 changed file: - testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt Changes: ===================================== testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt ===================================== @@ -1,4 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ -ref-names: $Format:%D$ View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f93b81… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0f93b81… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] BB 44103: Remove ref-names from attr's .git_archival.txt.
by Pier Angelo Vendrame (＠pierov) 14 Aug '25

14 Aug '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 438d91c1 by Pier Angelo Vendrame at 2025-08-14T16:15:18+02:00 BB 44103: Remove ref-names from attr's .git_archival.txt. The currently vendored copy of python-attrs's .git_archival.txt includes a ref-names field which might make source tarballs not reproducible. Upstream fixed this in da2333cd37747d692d5c78b0c94bd400ff883a9a, therefore we apply the same change until Mozilla vendors an updated copy of python-attrs. See also https://bugzilla.mozilla.org/show_bug.cgi?id=1980103. - - - - - 1 changed file: - testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt Changes: ===================================== testing/web-platform/tests/tools/third_party/attrs/.git_archival.txt ===================================== @@ -1,4 +1,3 @@ node: $Format:%H$ node-date: $Format:%cI$ describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$ -ref-names: $Format:%D$ View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/438… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/438… You're receiving this email because of your account on gitlab.torproject.org.

1 0