November 2025 - tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-144.0a1-16.0-2
by Pier Angelo Vendrame (＠pierov) 18 Nov '25

18 Nov '25

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

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41632: Enable linux-aarch64 in non-nightly builds
by morgan (＠morgan) 17 Nov '25

17 Nov '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 12226343 by Nicolas Vigier at 2025-11-17T19:10:52+00:00 Bug 41632: Enable linux-aarch64 in non-nightly builds - - - - - 1 changed file: - rbm.conf Changes: ===================================== rbm.conf ===================================== @@ -88,7 +88,7 @@ var: android-aarch64: '[% c("var/browser_platforms/is_android_release") %]' linux-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]' linux-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]' - linux-aarch64: '[% c("var/browser_platforms/is_desktop_release") && ( c("var/testbuild") || c("var/nightly") ) %]' + linux-aarch64: '[% c("var/browser_platforms/is_desktop_release") %]' windows-i686: '[% c("var/browser_platforms/is_desktop_release") && c("var/tor-browser") %]' windows-x86_64: '[% c("var/browser_platforms/is_desktop_release") %]' macos: '[% c("var/browser_platforms/is_desktop_release") %]' 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.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.5.0esr-15.0-1] fixup! MB 39: Add home page about:mullvad-browser
by morgan (＠morgan) 17 Nov '25

17 Nov '25

morgan pushed to branch mullvad-browser-140.5.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 4469cbad by Henry Wilkes at 2025-11-17T10:41:33+00:00 fixup! MB 39: Add home page about:mullvad-browser MB 486: Delay the update data for preloaded about:mullvad-browser pages. - - - - - 3 changed files: - browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - browser/components/tabbrowser/NewTabPagePreloading.sys.mjs Changes: ===================================== browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs ===================================== @@ -5,13 +5,34 @@ export class AboutMullvadBrowserChild extends JSWindowActorChild { handleEvent(event) { switch (event.type) { case "DOMContentLoaded": - this.sendQuery("AboutMullvadBrowser:GetUpdateData").then(data => { - const updateEvent = new this.contentWindow.CustomEvent("UpdateData", { - detail: Cu.cloneInto(data, this.contentWindow), - }); - this.contentWindow.dispatchEvent(updateEvent); + this.sendQuery("AboutMullvadBrowser:GetUpdateData").then(response => { + if (response.delayed) { + // Wait for DelayedUpdateData. + return; + } + this.#dispatchUpdateData(response.updateData); }); break; } } + + receiveMessage(message) { + switch (message.name) { + case "AboutMullvadBrowser:DelayedUpdateData": + this.#dispatchUpdateData(message.data); + break; + } + } + + /** + * Send the update data to the page. + * + * @param {object} data - The data to send. + */ + #dispatchUpdateData(data) { + const updateEvent = new this.contentWindow.CustomEvent("UpdateData", { + detail: Cu.cloneInto(data, this.contentWindow), + }); + this.contentWindow.dispatchEvent(updateEvent); + } } ===================================== browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs ===================================== @@ -2,30 +2,73 @@ * Actor parent class for the about:mullvad-browser page. */ export class AboutMullvadBrowserParent extends JSWindowActorParent { - receiveMessage(message) { + /** + * Whether this instance has a preloaded browser. + * + * @type {boolean} + */ + #preloaded = false; + + /** + * Method to be called when the browser corresponding to this actor has its + * preloadedState attribute removed. + */ + preloadedRemoved() { + if (!this.#preloaded) { + return; + } + this.#preloaded = false; + // Send in the initial data now that the page is actually going to be + // visible. + this.sendAsyncMessage( + "AboutMullvadBrowser:DelayedUpdateData", + this.#getUpdateData() + ); + } + + /** + * Get the update data for the page. + * + * @returns {object?} - The update data, or `null` if no update should be + * shown. + */ + #getUpdateData() { const shouldNotifyPref = "mullvadbrowser.post_update.shouldNotify"; + if (!Services.prefs.getBoolPref(shouldNotifyPref, false)) { + return null; + } + Services.prefs.clearUserPref(shouldNotifyPref); + // Try use the same URL as the about dialog. See mullvad-browser#411. + let updateURL = Services.urlFormatter.formatURLPref( + "app.releaseNotesURL.aboutDialog" + ); + if (updateURL === "about:blank") { + updateURL = Services.urlFormatter.formatURLPref( + "startup.homepage_override_url" + ); + } + + return { + version: Services.prefs.getCharPref( + "browser.startup.homepage_override.mullvadbrowser.version" + ), + url: updateURL, + }; + } + + receiveMessage(message) { switch (message.name) { case "AboutMullvadBrowser:GetUpdateData": { - if (!Services.prefs.getBoolPref(shouldNotifyPref, false)) { - return Promise.resolve(null); - } - Services.prefs.clearUserPref(shouldNotifyPref); - // Try use the same URL as the about dialog. See mullvad-browser#411. - let updateURL = Services.urlFormatter.formatURLPref( - "app.releaseNotesURL.aboutDialog" - ); - if (updateURL === "about:blank") { - updateURL = Services.urlFormatter.formatURLPref( - "startup.homepage_override_url" - ); + const browser = this.browsingContext.top.embedderElement; + if (browser?.getAttribute("preloadedState") === "preloaded") { + // Wait until the page is actually about to be shown before sending + // the initial data. + // Otherwise the preloaded page might grab the updateData even though + // it won't be shown as the landing page. See mullvad-browser#486. + this.#preloaded = true; + return Promise.resolve({ delayed: true }); } - - return Promise.resolve({ - version: Services.prefs.getCharPref( - "browser.startup.homepage_override.mullvadbrowser.version" - ), - url: updateURL, - }); + return Promise.resolve({ updateData: this.#getUpdateData() }); } } return undefined; ===================================== browser/components/tabbrowser/NewTabPagePreloading.sys.mjs ===================================== @@ -178,6 +178,17 @@ export let NewTabPagePreloading = { this.browserCounts[countKey]--; browser.removeAttribute("preloadedState"); browser.setAttribute("autocompletepopup", "PopupAutoComplete"); + // Copied from tor-browser. See mullvad-browser#486. + // Let a preloaded about:mullvad-browser page know that it is no longer + // preloaded (about to be shown). + try { + browser.browsingContext?.currentWindowGlobal + ?.getActor("AboutMullvadBrowser") + .preloadedRemoved(); + } catch { + // Not an about:mullvad-browser page with an AboutMullvadBrowserParent + // instance. + } } return browser; View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/446… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/446… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] 3 commits: Bug 41553: Disable some signing step when signing torvpn
by morgan (＠morgan) 17 Nov '25

17 Nov '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: cc45f360 by Nicolas Vigier at 2025-11-17T19:00:34+00:00 Bug 41553: Disable some signing step when signing torvpn Since torvpn is not currently built from `tor-browser-build`, skip `wait-for-finished-build` and `sync-builder-unsigned-to-local-signed` steps when signing torvpn. - - - - - d87f47a4 by Nicolas Vigier at 2025-11-17T19:00:34+00:00 Fix typo in release prep issue templates - - - - - af17097b by Nicolas Vigier at 2025-11-17T19:02:13+00:00 Bug 41553: Add Tor VPN release prep issue template - - - - - 7 changed files: - .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md - .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md - .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md - .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md - .gitlab/issue_templates/Release Prep - Tor Browser Stable.md - + .gitlab/issue_templates/Release Prep - Tor VPN.md - tools/signing/do-all-signing Changes: ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Alpha.md ===================================== @@ -9,7 +9,7 @@ - `${BUILD_SERVER}`: the server the main builder is using to build a browser release - `${BUILDER}`: whomever is building the release on the ${BUILD_SERVER} - **example**: `pierov` -- `${STAGING_SERVER}`: the server the signer is using to to run the signing process +- `${STAGING_SERVER}`: the server the signer is using to run the signing process - `${ESR_VERSION}`: the Mozilla defined ESR version, used in various places for building browser tags, labels, etc - **example**: `91.6.0` - `${MULLVAD_BROWSER_MAJOR}`: the Mullvad Browser major version ===================================== .gitlab/issue_templates/Release Prep - Mullvad Browser Stable.md ===================================== @@ -9,7 +9,7 @@ - `${BUILD_SERVER}`: the server the main builder is using to build a browser release - `${BUILDER}`: whomever is building the release on the ${BUILD_SERVER} - **example**: `pierov` -- `${STAGING_SERVER}`: the server the signer is using to to run the signing process +- `${STAGING_SERVER}`: the server the signer is using to run the signing process - `${ESR_VERSION}`: the Mozilla defined ESR version, used in various places for building browser tags, labels, etc - **example**: `91.6.0` - `${MULLVAD_BROWSER_MAJOR}`: the Mullvad Browser major version ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Alpha.md ===================================== @@ -9,7 +9,7 @@ - `${BUILD_SERVER}`: the server the main builder is using to build a browser release - `${BUILDER}`: whomever is building the release on the ${BUILD_SERVER} - **example**: `pierov` -- `${STAGING_SERVER}`: the server the signer is using to to run the signing process +- `${STAGING_SERVER}`: the server the signer is using to run the signing process - `${ESR_VERSION}`: the Mozilla defined ESR version, used in various places for building browser tags, labels, etc - **example**: `91.6.0` - `${TOR_BROWSER_MAJOR}`: the Tor Browser major version ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Legacy.md ===================================== @@ -8,7 +8,7 @@ - `${BUILD_SERVER}`: the server the main builder is using to build a browser release - `${BUILDER}`: whomever is building the release on the ${BUILD_SERVER} - **example**: `pierov` -- `${STAGING_SERVER}`: the server the signer is using to to run the signing process +- `${STAGING_SERVER}`: the server the signer is using to run the signing process - `${ESR_VERSION}`: the Mozilla defined ESR version, used in various places for building browser tags, labels, etc - **example**: `91.6.0` - `${TOR_BROWSER_MAJOR}`: the Tor Browser major version ===================================== .gitlab/issue_templates/Release Prep - Tor Browser Stable.md ===================================== @@ -9,7 +9,7 @@ - `${BUILD_SERVER}`: the server the main builder is using to build a browser release - `${BUILDER}`: whomever is building the release on the ${BUILD_SERVER} - **example**: `pierov` -- `${STAGING_SERVER}`: the server the signer is using to to run the signing process +- `${STAGING_SERVER}`: the server the signer is using to run the signing process - `${ESR_VERSION}`: the Mozilla defined ESR version, used in various places for building browser tags, labels, etc - **example**: `91.6.0` - `${TOR_BROWSER_MAJOR}`: the Tor Browser major version ===================================== .gitlab/issue_templates/Release Prep - Tor VPN.md ===================================== @@ -0,0 +1,95 @@ +# Release Prep Tor VPN + +- **NOTE** It is assumed the `vpn` release has been tagged in the `vpn.git` repository + +<details> + <summary>Explanation of variables</summary> + +- `${STAGING_SERVER}`: the server the signer is using to run the signing process +- `${TOR_VPN_VERSION}`: the Tor VPN version + - **example**: `1.3.0Beta` +- `${TOR_VPN_BUILD_N}`: the torvpn build revision for a given Tor VPN release; used in tagging git commits + - **example**: `build1` + +</details> + +<details> + <summary>Build Configuration</summary> + +### tor-browser-build: https://gitlab.torproject.org/tpo/applications/tor-browser-build.git +Tor VPN is on the `main` branch + +- [ ] Create a release preparation branch from the current `main` branch +- Edit `rbm.conf`, updating the following: + - [ ] `targets/torvpn/var/torbrowser_version`: updated to next torvpn version (`${TOR_VPN_VERSION}`) + - [ ] `targets/torvpn/var/torbrowser_build`: updated to `${TOR_VPN_BUILD_N}` (usually `build1`) + - [ ] `targets/torvpn/var/browser_release_date`: updated to build date. For the build to be reproducible, the date should be in the past when building. +- [ ] Open MR with above changes. + - **NOTE**: target the `main` branch +- [ ] Merge + +</details> + +<details> + <summary>Signing</summary> + +### release signing +- [ ] Assign this issue to the signer, one of: + - boklm + - ma1 + - morgan + - pierov +- [ ] Ensure all builders have matching builds +- Place the Tor VPN release to be signed in directory `torvpn/alpha/signed/${TOR_VPN_VERSION}`: + - [ ] `mkdir torvpn/alpha/signed/${TOR_VPN_VERSION} && cd torvpn/alpha/signed/${TOR_VPN_VERSION}` + - [ ] `wget https://${URL_PATH}/app-release.aab` (replacing `${URL_PATH}` with the location where the unsigned build has been published) + - [ ] `mv app-release.aab tor-vpn-${TOR_VPN_VERSION}.aab` + - [ ] `wget https://${URL_PATH}/app-release-unsigned.apk` (replacing `${URL_PATH}` with the location where the unsigned build has been published) + - [ ] `mv app-release-unsigned.apk tor-vpn-qa-unsigned-android-multiarch-${TOR_VPN_VERSION}.apk` + - [ ] `sha256sum tor-vpn-* > sha256sums-unsigned-build.txt` + - [ ] Compare checksums from `sha256sums-unsigned-build.txt` with expected checksums +- [ ] On `${STAGING_SERVER}`, ensure updated: + - [ ] `tor-browser-build` is on the right commit + - [ ] `tor-browser-build/tools/signing/set-config.hosts` + - `ssh_host_linux_signer`: ssh hostname of linux signing machine +- [ ] On `${STAGING_SERVER}` in a separate `screen` session, run do-all-signing script: + - Run: + ```bash + cd tor-browser-build/tools/signing/ && ./do-all-signing.torvpn + ``` + - **NOTE**: on successful execution, the signed binaries should have been copied to `staticiforme`. + +</details> + +<details> + <summary>Publishing</summary> + +### dist.torproject.org +- [ ] On `staticiforme.torproject.org`, static update components: + - Run: + ```bash + static-update-component dist.torproject.org + ``` +- [ ] On `staticiforme.torproject.org`, remove old release: + - **NOTE**: Skip this step if we need to hold on to older versions for some reason. + - [ ] `/srv/dist-master.torproject.org/htdocs/torvpn` + - Run: + ```bash + static-update-component dist.torproject.org + ``` + +### Google Play: https://play.google.com/apps/publish +- [ ] Publish AAB to Google Play: + - Select `Tor VPN` app + - Navigate to `Test and release > Internal testing` and click `Create new release` button: + - Upload the `tor-vpn-$version.aab` file + - Update Release Notes using the changenotes from donuts from the release issue + - Publish + - Promote to closed and open testing + +</details> + +/label ~"Apps::Type::ReleasePreparation" +/label ~"Apps::Impact::High" +/label ~"Priority::Blocker" +/label ~"Apps::Product::TorVPN" ===================================== tools/signing/do-all-signing ===================================== @@ -246,8 +246,10 @@ function do_step { export SIGNING_PROJECTNAME do_step set-time-on-signing-machine -do_step wait-for-finished-build -do_step sync-builder-unsigned-to-local-signed +[ "$SIGNING_PROJECTNAME" != 'torvpn' ] && \ + do_step wait-for-finished-build +[ "$SIGNING_PROJECTNAME" != 'torvpn' ] && \ + do_step sync-builder-unsigned-to-local-signed do_step clean-build-artifacts [ -n "$platform_macos" ] && \ do_step extract-dmg View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/compare/… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-144.0a1-16.0-2
by Pier Angelo Vendrame (＠pierov) 17 Nov '25

17 Nov '25

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

1 0

[Git][tpo/applications/tor-browser] Pushed new tag tor-browser-115.30.0esr-13.5-1-build3
by Pier Angelo Vendrame (＠pierov) 12 Nov '25

12 Nov '25

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

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-15.0.2-build1
by Pier Angelo Vendrame (＠pierov) 12 Nov '25

12 Nov '25

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

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5.25-build1
by Pier Angelo Vendrame (＠pierov) 12 Nov '25

12 Nov '25

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

1 0

[Git][tpo/applications/tor-browser-build][maint-15.0] Bug 41630: Prepare Tor Browser 15.0.2
by Pier Angelo Vendrame (＠pierov) 12 Nov '25

12 Nov '25

Pier Angelo Vendrame pushed to branch maint-15.0 at The Tor Project / Applications / tor-browser-build Commits: 77b98ef1 by Pier Angelo Vendrame at 2025-11-12T11:45:39+01:00 Bug 41630: Prepare Tor Browser 15.0.2 - - - - - 3 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/tor/config - rbm.conf Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,10 @@ +Tor Browser 15.0.2 - November 13 2025 + * All Platforms + * Updated Tor to 0.4.8.20 + * Build System + * Android + * Bug 41629: Bump JNA to 5.16.0 [tor-browser-build] + Tor Browser 15.0.1 - November 11 2025 * All Platforms * Updated NoScript to 13.4 ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.19 +version: 0.4.8.20 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== rbm.conf ===================================== @@ -74,11 +74,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '15.0.1' + torbrowser_version: '15.0.2' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2025/11/10 09:19:47' + browser_release_date: '2025/11/12 11:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' browser_default_channel: release browser_platforms: @@ -128,12 +128,13 @@ var: updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 15.0.1 - '15.0' - 14.5.8 - 14.5.7 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' - torbrowser_legacy_version: 13.5.24 + torbrowser_legacy_version: 13.5.25 torbrowser_legacy_platform_version: 115.30.0 # By default, we sort the list of installed packages. This allows sharing View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41631: Prepare Tor Browser 13.5.25.
by Pier Angelo Vendrame (＠pierov) 12 Nov '25

12 Nov '25

Pier Angelo Vendrame pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 4dd8aa83 by Pier Angelo Vendrame at 2025-11-12T12:06:34+01:00 Bug 41631: Prepare Tor Browser 13.5.25. - - - - - 5 changed files: - projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt - projects/firefox/config - projects/tor/config - rbm.conf - tools/relprep.py Changes: ===================================== projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt ===================================== @@ -1,3 +1,8 @@ +Tor Browser 13.5.25 - November 13 2025 + * All Platforms + * Updated Tor to 0.4.8.20 + * Bug 44335: Additional Security Fix Backport from Firefox 145 to esr115 [tor-browser] + Tor Browser 13.5.24 - November 11 2025 * All Platforms * Updated NoScript to 13.4 ===================================== projects/firefox/config ===================================== @@ -21,7 +21,7 @@ var: browser_series: '13.5' browser_rebase: 1 browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]' - browser_build: 2 + browser_build: 3 branding_directory_prefix: 'tb' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]' ===================================== projects/tor/config ===================================== @@ -1,6 +1,6 @@ # vim: filetype=yaml sw=2 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]' -version: 0.4.8.19 +version: 0.4.8.20 git_hash: 'tor-[% c("version") %]' git_url: https://gitlab.torproject.org/tpo/core/tor.git git_submodule: 1 ===================================== rbm.conf ===================================== @@ -73,11 +73,11 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '13.5.24' + torbrowser_version: '13.5.25' torbrowser_build: 'build1' # This should be the date of when the build is started. For the build # to be reproducible, browser_release_date should always be in the past. - browser_release_date: '2025/11/10 09:45:05' + browser_release_date: '2025/11/12 11:00:00' browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]' browser_platforms: # is_android_release and is_desktop_release are used to quickly @@ -115,9 +115,9 @@ var: updater_enabled: 1 build_mar: 1 torbrowser_incremental_from: + - 13.5.24 - 13.5.23 - 13.5.22 - - 13.5.21 mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]' # By default, we sort the list of installed packages. This allows sharing ===================================== tools/relprep.py ===================================== @@ -626,32 +626,10 @@ class ReleasePreparation: def update_rbm_conf(self): logger.info("Updating rbm.conf.") releases = {} - browsers = { - "tbb": '[% IF c("var/tor-browser") %]{}[% END %]', - "mb": '[% IF c("var/mullvad-browser") %]{}[% END %]', - } - incremental_from = [] - for b in ["tbb", "mb"]: - for rel in self.last_releases[(b, self.version.channel)]: - if rel.version not in releases: - releases[rel.version] = {} - releases[rel.version][b] = str(rel.version) - for version in sorted(releases.keys(), reverse=True): - if len(releases[version]) == 2: - incremental_from.append(releases[version]["tbb"]) - logger.debug( - "Building incremental from %s for both browsers.", version - ) - else: - for b, template in browsers.items(): - maybe_rel = releases[version].get(b) - if maybe_rel: - logger.debug( - "Building incremental from %s only for %s.", - version, - b, - ) - incremental_from.append(template.format(maybe_rel)) + incremental_from = [ + str(r.version) + for r in self.last_releases[("tbb", self.version.channel)] + ] separator = "\n--- |\n" path = self.base_path / "rbm.conf" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0