- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] BB 44801: Redact onion origins from Location.ancestorOrigins.
by ma1 (＠ma1) 31 Mar '26

31 Mar '26

ma1 pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 14471768 by hackademix at 2026-03-31T10:04:01+02:00 BB 44801: Redact onion origins from Location.ancestorOrigins. - - - - - 1 changed file: - docshell/base/CanonicalBrowsingContext.cpp Changes: ===================================== docshell/base/CanonicalBrowsingContext.cpp ===================================== @@ -41,6 +41,7 @@ #include "mozilla/StaticPrefs_browser.h" #include "mozilla/StaticPrefs_docshell.h" #include "mozilla/StaticPrefs_fission.h" +#include "mozilla/StaticPrefs_network.h" #include "mozilla/StaticPrefs_security.h" #include "mozilla/glean/DomMetrics.h" #include "nsILayoutHistoryState.h" @@ -3695,6 +3696,10 @@ void CanonicalBrowsingContext::CreateRedactedAncestorOriginsList( // 11. Let masked be false. bool masked = false; + // Tor-specific, not in spec: + // we want to redact cross-origin onions if hideOnionSource is true. + bool redactOnions = StaticPrefs::network_http_referer_hideOnionSource(); + if (referrerPolicy == ReferrerPolicy::No_referrer) { // 12. If referrerPolicy is "no-referrer", then set masked to true. masked = true; @@ -3705,6 +3710,12 @@ void CanonicalBrowsingContext::CreateRedactedAncestorOriginsList( // origin is not same origin with innerDoc's origin, then set masked to // true. masked = true; + } else if (redactOnions && ancestorWGP->DocumentPricipal()->GetIsOnion() && + !ancestorWGP->DocumentPrincipal()->Equals( + aThisDocumentPrincipal)) { + // Tor-specific, not in spec: + // mask parent origin if it's an onion it's different than this document's. + masked = true; } if (masked) { @@ -3721,6 +3732,13 @@ void CanonicalBrowsingContext::CreateRedactedAncestorOriginsList( // 16. For each ancestorOrigin of ancestorOrigins: for (const auto& ancestorOrigin : parentAncestorOriginsList) { + // Tor-specific, not in spec: + // Redact any ancestor onion origin different than this document's origin. + if (redactOnions && ancestorOrigin && ancestorOrigin->GetIsOnion() && + !ancestorOrigin->Equals(aThisDocumentPrincipal)) { + ancestorPrincipals.AppendElement(nullptr); + continue; + } // 16.1 if masked is true if (masked && ancestorOrigin && ancestorOrigin->Equals(ancestorWGP->DocumentPrincipal())) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1447176… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1447176… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] fixup! TB 44591: Force extensions initialization on startup.
by clairehurst (＠clairehurst) 31 Mar '26

31 Mar '26

clairehurst pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: b419c1df by clairehurst at 2026-03-30T10:45:38-06:00 fixup! TB 44591: Force extensions initialization on startup. Revert "TB 44591: Force extensions initialization on startup." This reverts commit bd2c6529c5e5c32677673df898983ae1699aff71. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/FenixApplication.kt ===================================== @@ -32,7 +32,6 @@ import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import kotlinx.coroutines.launch import mozilla.appservices.autofill.AutofillApiException -import mozilla.components.browser.engine.gecko.GeckoEngine import mozilla.components.browser.state.action.SystemAction import mozilla.components.browser.state.selector.selectedTab import mozilla.components.browser.state.store.BrowserStore @@ -839,20 +838,6 @@ open class FenixApplication : Application(), Provider, ThemeProvider { components.useCases.tabsUseCases.selectTab(sessionId) }, onExtensionsLoaded = { extensions -> - - // temp fix for tb#44591 "fails to initialize WebExtensions" - // disable and enable each extension to properly initialize them - extensions.forEach { extension -> - if (extension.isEnabled()) { - (components.core.engine as GeckoEngine).disableWebExtension( - extension, - onSuccess = { - (components.core.engine as GeckoEngine).enableWebExtension(extension) - }, - ) - } - } - // Delay until bootstrap is finished so that it will actually update tor-browser#44303 components.torController.registerRunOnceBootstrapped(object : RunOnceBootstrapped { override fun onBootstrapped() { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b419c1d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/b419c1d… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser
by henry (＠henry) 31 Mar '26

31 Mar '26

henry pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: e9a76ea0 by Henry Wilkes at 2026-03-30T16:44:16+01:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 44797: Clean up about:torconnect styling. 1. Do not use `error-pages.css`. This made the previous page too quirky and meant we had to deal with styling interference from mozilla. We only need a few of our own CSS additions to cover the useful styling we inherited before. 2. Rather than share elements, each stage will get its own `torconnect-stage-content` element, which will show the corresponding stage. This should simplify the javascript once this is complete. And it should make future adjustments easier. See below. 3. Change the body `display` to `grid`, which can dynamically handle the spacing of all elements. One improvement is that this will ensure that the progress bar's shadow will not overlap the title when the vertical height is narrow. 4. Simplify some of the styling spacing logic. 5. Some other minor clean ups. Example markup that will be used in the future: ```html <div class="torconnect-stage-content" data-stage-name="Start"> <img class="torconnect-icon" alt="" /> <h1 class="torconnect-heading" tabindex="-1"></h1> <div class="torconnect-text-container">  </div> <div class="torconnect-controls-container">  </div> </div> ``` - - - - - 3 changed files: - browser/components/torconnect/content/aboutTorConnect.css - browser/components/torconnect/content/aboutTorConnect.html - browser/components/torconnect/content/aboutTorConnect.js Changes: ===================================== browser/components/torconnect/content/aboutTorConnect.css ===================================== @@ -1,6 +1,5 @@ /* Copyright (c) 2021, The Tor Project, Inc. */ -@import url("chrome://global/skin/error-pages.css"); @import url("chrome://global/skin/onion-pattern.css"); body:not(.loaded) { @@ -8,7 +7,23 @@ body:not(.loaded) { display: none; } +body { + margin: 0; + min-height: 100vh; + --progress-shadow-height: 66px; + display: grid; + grid-template: + "progress progress progress progress progress" minmax(calc(var(--progress-shadow-height) + var(--space-large)), 10vh) + ". . breadcrumbs . ." auto + ". icon heading . ." auto + ". icon text-container . ." auto + ". . controls-container . ." auto + ". . . . ." minmax(var(--onion-pattern-height), 1fr) + / var(--space-large) minmax(max-content, 1fr) minmax(350px, 700px) 1fr var(--space-large); +} + #breadcrumbs { + grid-area: breadcrumbs; display: flex; align-items: center; margin: 0 0 var(--space-xlarge) 0; @@ -78,11 +93,6 @@ body:not(.loaded) { display: none; } -#tor-connect-heading { - /* Do not show the focus outline. */ - outline: none; -} - #connect-to-tor { margin-inline-start: 0; } @@ -95,10 +105,6 @@ body:not(.loaded) { list-style-image: url("chrome://browser/content/torconnect/tor-connect-broken.svg"); } -#location-settings-icon { - list-style-image: url("chrome://browser/content/torconnect/globe.svg"); -} - #try-bridge { cursor: default; } @@ -107,38 +113,17 @@ body:not(.loaded) { list-style-image: url("chrome://browser/content/torconnect/bridge.svg"); } -#locationDropdownLabel { - margin-block: auto; - margin-inline: var(--space-xsmall); -} - #locationDropdownLabel.error { color: var(--text-color-error); } -/* this follows similar css in error-pages.css for buttons */ -@media only screen and (min-width: 480px) { - form#locationDropdown { - margin-inline: var(--space-xsmall); - /* subtracting out the margin is needeed because by - default forms have different margins than buttons */ - max-width: calc(100% - 2 * var(--space-xsmall)); - } -} - -@media only screen and (max-width: 480px) { - #tryAgainButton { - margin-top: var(--space-xsmall); - } -} - form#locationDropdown { width: 240px; } form#locationDropdown select { - max-width: 100%; - margin-inline: 0; + width: 100%; + margin: 0; font-weight: var(--font-weight-bold); } @@ -154,9 +139,7 @@ form#locationDropdown select { } #progressBar:not([hidden]) { - position: fixed; - inset-block-start: 0; - inset-inline: 0; + grid-area: progress; display: grid; --progress-percent: 0%; --progress-animation: progressAnimation 5s ease infinite; @@ -176,7 +159,7 @@ form#locationDropdown select { #progressBackground { z-index: 1; width: var(--progress-percent); - height: 66px; + height: var(--progress-shadow-height); margin-block-start: -26px; background-image: linear-gradient(var(--progressbar-shadow-start), var(--background-color-canvas) 100%), var(--progressbar-gradient); animation: var(--progress-animation); @@ -223,46 +206,94 @@ form#locationDropdown select { } } -#connectPageContainer { - margin-top: 10vh; - width: 100%; - max-width: 45em; -} - #quickstartToggle { width: max-content; } -/* mirrors p element spacing */ #viewLogButton { - margin: var(--space-large) 0; + margin-inline: 0; + margin-block-start: var(--space-large); } -body.aboutTorConnect { - justify-content: space-between; - /* Always reserve 150px for the background, plus padding with content. */ - padding-block-end: calc(var(--onion-pattern-height) + var(--space-large)); +.torconnect-stage-content:not(.show-stage) { + display: none; } -body.aboutTorConnect .title { - background-image: url("chrome://browser/content/torconnect/tor-connect.svg"); +.torconnect-stage-content { + display: contents; +} + +.torconnect-icon { + grid-area: icon; + justify-self: end; + width: 52px; + height: 52px; + margin-inline-end: var(--space-xlarge); + content: url("chrome://browser/content/torconnect/tor-connect.svg"); -moz-context-properties: stroke, fill, fill-opacity; 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; + /* Make non-interactive (non-draggable). */ + pointer-events: none; } -body.aboutTorConnect .title.offline { - background-image: url("chrome://browser/content/torconnect/connection-failure.svg"); +.torconnect-icon.offline-icon { + content: url("chrome://browser/content/torconnect/connection-failure.svg"); } -body.aboutTorConnect .title:is(.assist, .final) { - background-image: url("chrome://browser/content/torconnect/tor-connect-broken.svg"); +.torconnect-icon.assist-icon { + content: url("chrome://browser/content/torconnect/tor-connect-broken.svg"); } -body.aboutTorConnect .title.location { - background-image: url("chrome://browser/content/torconnect/connection-location.svg"); +.torconnect-icon.location-icon { + content: url("chrome://browser/content/torconnect/connection-location.svg"); stroke: var(--icon-color-warning); } + +.torconnect-heading { + grid-area: heading; + /* Do not show the focus outline. */ + outline: none; + font-size: var(--font-size-xxxlarge); + margin: 0; + margin-block-end: var(--space-xxlarge); +} + +.torconnect-text-container { + grid-area: text-container; +} + +.torconnect-text-container p { + margin: 0; +} + +.torconnect-text-container > *:not(:last-child) { + margin-block-end: var(--space-large); +} + +.torconnect-controls-container { + grid-area: controls-container; + margin-block: var(--space-xlarge) var(--space-large); + display: flex; + flex-wrap: wrap; + flex-direction: row; + justify-content: end; + align-items: center; + /* Gap between children and rows. */ + gap: var(--space-small) var(--space-small); +} + +.torconnect-controls-container > * { + flex: 0 0 max-content; + margin: 0; +} + +/* Temporary hacks for the connectPageContainer. */ +#connectPageContainer .torconnect-text-container > *:last-child { + margin-block-end: var(--space-large); +} + +#connectPageContainer .torconnect-controls-container { + margin-block-start: calc(var(--space-xlarge) - var(--space-large)); +} ===================================== browser/components/torconnect/content/aboutTorConnect.html ===================================== @@ -8,12 +8,11 @@ /> <title data-l10n-id="tor-connect-page-title"></title> + <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" /> <link rel="stylesheet" href="chrome://global/skin/tor-common.css" /> <link rel="stylesheet" href="chrome://browser/content/torconnect/aboutTorConnect.css" - type="text/css" - media="all" /> <link rel="localization" href="toolkit/global/tor-browser.ftl" /> @@ -23,39 +22,42 @@ src="chrome://global/content/elements/moz-toggle.mjs" ></script> </head> - <body class="aboutTorConnect onion-pattern-background"> + <body class="onion-pattern-background"> <div id="progressBar" hidden="hidden"> <div id="progressSolid"></div> <div id="progressBackground"></div> <div id="progressBarBackground"></div> </div> - <div id="connectPageContainer" class="container"> - <div id="breadcrumbs" class="hidden"> - <span id="connect-to-tor" class="breadcrumb-item"> - <span id="connect-to-tor-icon" class="breadcrumb-icon"></span> - <span class="breadcrumb-label"></span> - </span> - <span - id="connection-assist-separator" - class="breadcrumb-separator breadcrumb-icon" - ></span> - <span id="connection-assist" class="breadcrumb-item"> - <span id="connection-assist-icon" class="breadcrumb-icon"></span> - <span class="breadcrumb-label"></span> - </span> - <span - id="try-bridge-separator" - class="breadcrumb-separator breadcrumb-icon" - ></span> - <span id="try-bridge" class="breadcrumb-item"> - <span id="try-bridge-icon" class="breadcrumb-icon"></span> - <span class="breadcrumb-label"></span> - </span> - </div> - <div id="text-container"> - <div class="title"> - <h1 id="tor-connect-heading" class="title-text" tabindex="-1"></h1> - </div> + <div id="breadcrumbs" class="hidden"> + <span id="connect-to-tor" class="breadcrumb-item"> + <span id="connect-to-tor-icon" class="breadcrumb-icon"></span> + <span class="breadcrumb-label"></span> + </span> + <span + id="connection-assist-separator" + class="breadcrumb-separator breadcrumb-icon" + ></span> + <span id="connection-assist" class="breadcrumb-item"> + <span id="connection-assist-icon" class="breadcrumb-icon"></span> + <span class="breadcrumb-label"></span> + </span> + <span + id="try-bridge-separator" + class="breadcrumb-separator breadcrumb-icon" + ></span> + <span id="try-bridge" class="breadcrumb-item"> + <span id="try-bridge-icon" class="breadcrumb-icon"></span> + <span class="breadcrumb-label"></span> + </span> + </div> + <div id="connectPageContainer" class="torconnect-stage-content"> + <img id="tor-connect-icon" class="torconnect-icon" alt="" /> + <h1 + id="tor-connect-heading" + class="torconnect-heading" + tabindex="-1" + ></h1> + <div class="torconnect-text-container"> <div id="connectLongContent"> <p id="connectLongContentText"></p> </div> @@ -68,26 +70,21 @@ <div id="quickstartContainer"> <moz-toggle id="quickstartToggle"></moz-toggle> </div> - - <div id="connectButtonContainer" class="button-container"> - <button id="restartButton" hidden="true"></button> - <button id="configureButton" hidden="true"></button> - <button id="cancelButton" hidden="true"></button> - <button id="connectButton" hidden="true" class="tor-button"></button> - <label id="locationDropdownLabel" for="countries"></label> - <form id="locationDropdown" hidden="true"> - <select id="regions-select"> - <option id="first-region-option"></option> - <optgroup id="frequent-regions-option-group"></optgroup> - <optgroup id="full-regions-option-group"></optgroup> - </select> - </form> - <button - id="tryBridgeButton" - hidden="true" - class="tor-button" - ></button> - </div> + </div> + <div class="torconnect-controls-container"> + <button id="restartButton" hidden="true"></button> + <button id="configureButton" hidden="true"></button> + <button id="cancelButton" hidden="true"></button> + <button id="connectButton" hidden="true" class="tor-button"></button> + <label id="locationDropdownLabel" for="countries"></label> + <form id="locationDropdown" hidden="true"> + <select id="regions-select"> + <option id="first-region-option"></option> + <optgroup id="frequent-regions-option-group"></optgroup> + <optgroup id="full-regions-option-group"></optgroup> + </select> + </form> + <button id="tryBridgeButton" hidden="true" class="tor-button"></button> </div> </div> <script src="chrome://browser/content/torconnect/aboutTorConnect.js"></script> ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -28,7 +28,7 @@ const BreadcrumbStatus = Object.freeze({ class AboutTorConnect { selectors = Object.freeze({ textContainer: { - title: "div.title", + icon: "#tor-connect-icon", longContentText: "#connectLongContentText", }, progress: { @@ -72,7 +72,7 @@ class AboutTorConnect { }); elements = Object.freeze({ - title: document.querySelector(this.selectors.textContainer.title), + icon: document.querySelector(this.selectors.textContainer.icon), heading: document.getElementById("tor-connect-heading"), longContentText: document.querySelector( this.selectors.textContainer.longContentText @@ -225,9 +225,9 @@ class AboutTorConnect { setTitle(title, className) { this.elements.heading.textContent = title; - this.elements.title.className = "title"; + this.elements.icon.className = "torconnect-icon"; if (className) { - this.elements.title.classList.add(className); + this.elements.icon.classList.add(className); } } @@ -348,10 +348,22 @@ class AboutTorConnect { // selectRegionOption. this.selectedRegion = stage.defaultRegion; + let prevPageEl = document.querySelector( + ".torconnect-stage-content.show-stage" + ); + let pageEl = document.getElementById("connectPageContainer"); + for (const maybePageEl of document.querySelectorAll( + ".torconnect-stage-content" + )) { + if (maybePageEl.dataset.stageName === stage.name) { + pageEl = maybePageEl; + break; + } + } // By default we want to reset the focus to the top of the page when // changing the displayed page since we want a user to read the new page // before activating a control. - let moveFocus = this.elements.heading; + let moveFocus = pageEl.querySelector(".torconnect-heading"); if (stage.name === "Bootstrapping") { this.preBootstrappingStage = prevStage; @@ -461,6 +473,8 @@ class AboutTorConnect { this.hide(this.elements.viewLogButton); } + prevPageEl?.classList.remove("show-stage"); + pageEl.classList.add("show-stage"); document.body.classList.toggle("loaded", isLoaded); moveFocus.focus(); } @@ -557,7 +571,7 @@ class AboutTorConnect { } showOffline() { - this.setTitle(TorStrings.torConnect.noInternet, "offline"); + this.setTitle(TorStrings.torConnect.noInternet, "offline-icon"); this.setLongText(TorStrings.torConnect.noInternetDescription); this.elements.progressDescription.textContent = TorStrings.torConnect.offline; @@ -573,7 +587,7 @@ class AboutTorConnect { } showChooseRegion(error) { - this.setTitle(TorStrings.torConnect.couldNotConnect, "assist"); + this.setTitle(TorStrings.torConnect.couldNotConnect, "assist-icon"); this.showConfigureConnectionLink(TorStrings.torConnect.assistDescription); this.elements.progressDescription.textContent = this.getMaybeLocalizedError(error); @@ -586,7 +600,7 @@ class AboutTorConnect { } showRegionNotFound() { - this.setTitle(TorStrings.torConnect.errorLocation, "location"); + this.setTitle(TorStrings.torConnect.errorLocation, "location-icon"); this.showConfigureConnectionLink( TorStrings.torConnect.errorLocationDescription ); @@ -601,7 +615,7 @@ class AboutTorConnect { } showConfirmRegion(error) { - this.setTitle(TorStrings.torConnect.isLocationCorrect, "location"); + this.setTitle(TorStrings.torConnect.isLocationCorrect, "location-icon"); this.showConfigureConnectionLink( TorStrings.torConnect.isLocationCorrectDescription ); @@ -616,7 +630,7 @@ class AboutTorConnect { } showFinalError(error) { - this.setTitle(TorStrings.torConnect.finalError, "final"); + this.setTitle(TorStrings.torConnect.finalError, "assist-icon"); this.setLongText(TorStrings.torConnect.finalErrorDescription); this.elements.progressDescription.textContent = this.getMaybeLocalizedError(error); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e9a76ea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e9a76ea… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-149.0a1-16.0-2] fixup! BB 42305: Add script to combine translation files across versions.
by henry (＠henry) 31 Mar '26

31 Mar '26

henry pushed to branch mullvad-browser-149.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: 16cd5e24 by Henry Wilkes at 2026-03-30T16:40:39+01:00 fixup! BB 42305: Add script to combine translation files across versions. TB 43180: Remove translation CI's legacy 13.5 logic. - - - - - 1 changed file: - tools/base_browser/l10n/combine-translation-versions.py Changes: ===================================== tools/base_browser/l10n/combine-translation-versions.py ===================================== @@ -194,14 +194,11 @@ class BrowserBranch: ) -def get_stable_branch( - compare_version: BrowserBranch, -) -> tuple[BrowserBranch, BrowserBranch | None]: +def get_stable_branch(compare_version: BrowserBranch) -> BrowserBranch: """Find the most recent stable branch in the origin repository. :param compare_version: The development branch to compare against. - :returns: The stable and legacy branches. If no legacy branch is found, - `None` will be returned instead. + :returns: The stable branch. """ # We search for build1 tags. These are added *after* the rebase of browser # commits, so the corresponding branch should contain our strings. @@ -218,9 +215,7 @@ def get_stable_branch( fetch_args = ("--depth=1", "--filter=object:type=tag") git_run(["fetch", *fetch_args, "origin", "tag", tag_glob]) stable_branches = [] - legacy_branches = [] stable_annotation_regex = re.compile(r"\bstable\b") - legacy_annotation_regex = re.compile(r"\blegacy\b") tag_pattern = re.compile( rf"^{re.escape(compare_version.prefix)}-[^-]+-[^-]+-[^-]+-build1$" ) @@ -230,9 +225,7 @@ def get_stable_branch( ): if not tag_pattern.match(build_tag): continue - is_stable = bool(stable_annotation_regex.search(annotation)) - is_legacy = bool(legacy_annotation_regex.search(annotation)) - if not is_stable and not is_legacy: + if not stable_annotation_regex.search(annotation): continue try: # Branch name is the same as the tag, minus "-build1". @@ -242,40 +235,30 @@ def get_stable_branch( continue if branch.prefix != compare_version.prefix: continue - if is_stable: - # Stable can be one release version behind. - # NOTE: In principle, when switching between versions there may be a - # window of time where the development branch has not yet progressed - # to the next ".0" release, so has the same browser version as the - # stable branch. So we also allow for matching browser versions. - # NOTE: - # 1. The "Will be unused in" message will not make sense, but we do - # not expect string differences in this scenario. - # 2. We do not expect this scenario to last for long. - release_diff = compare_version.browser_version - branch.browser_version - if release_diff < 0.0 or release_diff > 1.0: - continue - stable_branches.append(branch) - elif is_legacy: - # Legacy can be arbitrary release versions behind. - legacy_branches.append(branch) + # Stable can be one release version behind. + # NOTE: In principle, when switching between versions there may be a + # window of time where the development branch has not yet progressed + # to the next ".0" release, so has the same browser version as the + # stable branch. So we also allow for matching browser versions. + # NOTE: + # 1. The "Will be unused in" message will not make sense, but we do + # not expect string differences in this scenario. + # 2. We do not expect this scenario to last for long. + release_diff = compare_version.browser_version - branch.browser_version + if release_diff < 0.0 or release_diff > 1.0: + continue + stable_branches.append(branch) if not stable_branches: raise Exception("No stable build1 branch found") - return ( - # Return the stable branch with the highest version. - max(stable_branches), - max(legacy_branches) if legacy_branches else None, - ) + # Return the stable branch with the highest version. + return max(stable_branches) current_branch = BrowserBranch(args.current_branch, is_head=True) -stable_branch, legacy_branch = get_stable_branch(current_branch) - -if os.environ.get("TRANSLATION_INCLUDE_LEGACY", "") != "true": - legacy_branch = None +stable_branch = get_stable_branch(current_branch) files_list = [] @@ -330,32 +313,6 @@ for file_dict in json.loads(args.files): f"Will be unused in {current_branch.browser_version_name}!", ) - if legacy_branch and not file_dict.get("exclude-legacy", False): - legacy_file = legacy_branch.get_file(name, where_dirs) - if legacy_file is not None and current_file is None and stable_file is None: - logger.warning(f"{name} still exists in the legacy branch") - elif legacy_file is None: - logger.warning(f"{name} does not exist in the legacy branch") - elif stable_file is not None and legacy_file.path != stable_file.path: - logger.warning( - f"{name} has different paths in the stable and legacy branch. " - f"{stable_file.path} : {legacy_file.path}" - ) - elif current_file is not None and legacy_file.path != current_file.path: - logger.warning( - f"{name} has different paths in the current and legacy branch. " - f"{current_file.path} : {legacy_file.path}" - ) - - content = combine_files( - name, - content, - legacy_file.content, - f"Unused in {stable_branch.browser_version_name}!", - ) - elif legacy_branch: - logger.info(f"Excluding legacy branch for {name}") - files_list.append({ "name": name, # If "directory" is unspecified, we place the file directly beneath @@ -380,8 +337,5 @@ json_data = { "files": files_list, } -if legacy_branch: - json_data["legacy-branch"] = legacy_branch.name - with open(args.outname, "w") as file: json.dump(json_data, file) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/16c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/16c… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] fixup! Add CI for Tor Browser
by henry (＠henry) 31 Mar '26

31 Mar '26

henry pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 23688fca by Henry Wilkes at 2026-03-30T15:36:53+00:00 fixup! Add CI for Tor Browser TB 43180: Drop translation files from the translation CI config. - - - - - 1 changed file: - .gitlab/ci/jobs/update-translations.yml Changes: ===================================== .gitlab/ci/jobs/update-translations.yml ===================================== @@ -62,11 +62,8 @@ "branch": "tor-browser" }, { "name": "tor-browser.ftl", "branch": "tor-browser" }, - { "name": "aboutTBUpdate.dtd", "branch": "tor-browser" }, - { "name": "torbutton.dtd", "branch": "tor-browser" }, { "name": "onionLocation.properties", "branch": "tor-browser" }, { "name": "settings.properties", "branch": "tor-browser" }, - { "name": "torbutton.properties", "branch": "tor-browser" }, { "name": "torConnect.properties", "branch": "tor-browser" }, { "name": "torlauncher.properties", "branch": "tor-browser" }, { "name": "base-browser.ftl", "branch": "base-browser" }, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/23688fc… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/23688fc… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] 2 commits: fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser
by morgan (＠morgan) 31 Mar '26

31 Mar '26

morgan pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: c80e93f9 by Henry Wilkes at 2026-03-30T15:23:45+00:00 fixup! TB 27476: Implement about:torconnect captive portal within Tor Browser TB 44781: Use a static title for `about:torconnect`. We now use Fluent to set the page `<title>`, this causes some delay between the page being loaded and the title being set. Which cause the `about:torconnect` URL to flash in the browser tab selector. Moreover, even the prior non-Fluent approach would have "New Tab" flash in the title just before "Connect to Tor" was set. As such, we adjust `tabbrowser.js` and `tabs.js` to: 1. Set the `about:torconnect`'s tab label to the expected page title before the page has loaded and set it's title. 2. Set the very first tab's label to the `about:torconnect` page title at startup, rather than "New Tab". - - - - - 5da6decb by Henry Wilkes at 2026-03-30T15:23:45+00:00 fixup! Tor Browser strings TB 44781: Add the Fluent tor connect title. - - - - - 5 changed files: - browser/components/tabbrowser/content/tabbrowser.js - browser/components/tabbrowser/content/tabs.js - browser/components/torconnect/content/aboutTorConnect.html - browser/components/torconnect/content/aboutTorConnect.js - toolkit/locales/en-US/toolkit/global/tor-browser.ftl Changes: ===================================== browser/components/tabbrowser/content/tabbrowser.js ===================================== @@ -133,6 +133,11 @@ true ); }); + // Add a synchronous localisation to get the about:torconnect title. + // See tor-browser#44781. + ChromeUtils.defineLazyGetter(this, "torconnectLocalization", () => { + return new Localization(["toolkit/global/tor-browser.ftl"], true); + }); XPCOMUtils.defineLazyPreferenceGetter( this, "_shouldExposeContentTitle", @@ -2113,6 +2118,39 @@ return false; } + // We want to set the title for an about:torconnect tab prior to the page + // being loaded. In particular, we need to wait for: + // + // 1. The first `<browser>` element to switch `currentURI` from + // `about:blank` to `about:torconnect`. + // 2. The page's `<title>` to be set, which is delayed by the page load + // and the async FluentDOM. + // + // This avoids flashes of "New Tab" and the URL appearing in the tab + // label. See tor-browser#44781. + if (aTab._isFirstTabLoading) { + if (!isURL && !isContentTitle) { + // Wait until we have a proper title or URL. + // NOTES: + // 1. This is only expected for the first call to `onLocationChange` + // for the very first tab opened in a new window. In this scenario, + // we expect the page's `currentURI` to be `about:blank` (and not + // the actual `chrome:` path to `blanktab.html`). We use the + // `_isFirstTabLoading` condition as an extra protection. + // 2. We have already set the title for this tab in + // `MozTabbrowserTabs.init`, depending on whether we expect this to + // turn into `about:torconnect` or a "New Tab" (`about:tor` or + // `blanktab.html`). So we don't need to make any changes here. + return false; + } + delete aTab._isFirstTabLoading; + } + if (isURL && aLabel.startsWith("about:torconnect")) { + aLabel = this.tabContainer.torconnectTitle; + isContentTitle = true; + isURL = false; + } + // If it's a long data: URI that uses base64 encoding, truncate to a // reasonable length rather than trying to display the entire thing, // which can hang or crash the browser. ===================================== browser/components/tabbrowser/content/tabs.js ===================================== @@ -132,7 +132,16 @@ this._hiddenSoundPlayingTabs = new Set(); this.previewPanel = null; - this.allTabs[0].label = this.emptyTabTitle; + // When a new application window is spawned, this will set the initial + // tab's displayed title. If `shouldShowTorConnect` is true, we expect + // this first page to be `about:torconnect`, so we show the corresponding + // title that will be used once the page is shown. See tor-browser#44781. + this.allTabs[0].label = TorConnect.shouldShowTorConnect + ? this.torconnectTitle + : this.emptyTabTitle; + // Mark this as the first tab that is still loading. This can be cleared + // once we have a definite title or URI. + this.allTabs[0]._isFirstTabLoading = true; // Hide the secondary text for locales where it is unsupported due to size constraints. const language = Services.locale.appLocaleAsBCP47; @@ -807,6 +816,18 @@ return gBrowser.tabLocalization.formatValueSync(l10nId); } + /** + * The about:torconnect page <title>, to be fetched when about:torconnect + * has not yet been loaded. + * + * @type {string} + */ + get torconnectTitle() { + return gBrowser.torconnectLocalization.formatValueSync( + "tor-connect-page-title" + ); + } + get tabbox() { return document.getElementById("tabbrowser-tabbox"); } ===================================== browser/components/torconnect/content/aboutTorConnect.html ===================================== @@ -6,6 +6,8 @@ http-equiv="Content-Security-Policy" content="default-src chrome:; object-src 'none'" /> + <title data-l10n-id="tor-connect-page-title"></title> + <link rel="stylesheet" href="chrome://global/skin/tor-common.css" /> <link rel="stylesheet" @@ -14,6 +16,8 @@ media="all" /> + <link rel="localization" href="toolkit/global/tor-browser.ftl" /> + <script type="module" src="chrome://global/content/elements/moz-toggle.mjs" ===================================== browser/components/torconnect/content/aboutTorConnect.js ===================================== @@ -229,7 +229,6 @@ class AboutTorConnect { if (className) { this.elements.title.classList.add(className); } - document.title = title; } setLongText(...args) { ===================================== toolkit/locales/en-US/toolkit/global/tor-browser.ftl ===================================== @@ -9,6 +9,12 @@ appmenu-open-tor-manual = .label = Tor Browser manual .accesskey = m +## Tor connect page. + +# The tab name for the page. +# Here "Tor" refers to the Tor network. +tor-connect-page-title = Connect to Tor + ## Tor Browser home page. tor-browser-home-heading-stable = Explore. Privately. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/388ab3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/388ab3… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-149.0a1-16.0-2] fixup! TB 7494: Create local home page for TBB.
by morgan (＠morgan) 31 Mar '26

31 Mar '26

morgan pushed to branch tor-browser-149.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 388ab393 by Henry Wilkes at 2026-03-30T15:13:36+00:00 fixup! TB 7494: Create local home page for TBB. TB 44799: Replace colour of the Onionize toggle with a tor colour. - - - - - 1 changed file: - browser/components/abouttor/content/aboutTor.css Changes: ===================================== browser/components/abouttor/content/aboutTor.css ===================================== @@ -298,7 +298,7 @@ body:not(.show-survey) #survey { } #search-form.onionized-search #onionize-toggle { - color: var(--link-color); + color: var(--text-color-tor-light); } #survey { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/388ab39… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/388ab39… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser-build][main] Update main and drop maint-13.5 from Target Branches in default MR template
by morgan (＠morgan) 31 Mar '26

31 Mar '26

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 167fdd8f by Morgan at 2026-03-30T14:54:02+00:00 Update main and drop maint-13.5 from Target Branches in default MR template - - - - - 1 changed file: - .gitlab/merge_request_templates/default.md Changes: ===================================== .gitlab/merge_request_templates/default.md ===================================== @@ -19,9 +19,8 @@  #### Target Branches - - [ ] **`main`**: esr140-15.0 + - [ ] **`main`**: rapid release, 16.0 - [ ] **`maint-15.0`**: esr140-15.0 - - [ ] **`maint-13.5`**: esr115-13.5 ### Backporting View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser-build][maint-15.0] Bug 41741: Add rewrite rules for 13.5-specific update path
by boklm (＠boklm) 27 Mar '26

27 Mar '26

boklm pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build Commits: 007bdcf0 by Nicolas Vigier at 2026-03-27T12:12:35+01:00 Bug 41741: Add rewrite rules for 13.5-specific update path - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -127,4 +127,8 @@ htaccess_rewrite_rules: RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last] RewriteRule ^[^/]+/13\.5/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last] RewriteRule ^[^/]+/13\.5\.[0123456]/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last] + # tor-browser-build#41741: Create a 13.5-specific update path + RewriteRule ^[^/]+/13\.5\.[789]/.* https://aus1.torproject.org/torbrowser/update_legacy13.5/release/$0 [last] + RewriteRule ^[^/]+/13\.5\.1\d/.* https://aus1.torproject.org/torbrowser/update_legacy13.5/release/$0 [last] + RewriteRule ^[^/]+/13\.5\.2[012345678]/.* https://aus1.torproject.org/torbrowser/update_legacy13.5/release/$0 [last] [% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41741: Add rewrite rules for 13.5-specific update path
by boklm (＠boklm) 27 Mar '26

27 Mar '26

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: cfc4d26f by Nicolas Vigier at 2026-03-26T14:43:44+01:00 Bug 41741: Add rewrite rules for 13.5-specific update path - - - - - 1 changed file: - projects/release/update_responses_config.yml Changes: ===================================== projects/release/update_responses_config.yml ===================================== @@ -124,4 +124,8 @@ htaccess_rewrite_rules: RewriteRule ^[^/]+/13\.0.*/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last] RewriteRule ^[^/]+/13\.5/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last] RewriteRule ^[^/]+/13\.5\.[0123456]/.* https://aus1.torproject.org/torbrowser/update_pre14.0/release/$0 [last] + # tor-browser-build#41741: Create a 13.5-specific update path + RewriteRule ^[^/]+/13\.5\.[789]/.* https://aus1.torproject.org/torbrowser/update_legacy13.5/release/$0 [last] + RewriteRule ^[^/]+/13\.5\.1\d/.* https://aus1.torproject.org/torbrowser/update_legacy13.5/release/$0 [last] + RewriteRule ^[^/]+/13\.5\.2[012345678]/.* https://aus1.torproject.org/torbrowser/update_legacy13.5/release/$0 [last] [% END -%] View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0