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
5 changed files:
- projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
- projects/firefox/config
- projects/tor/config
- rbm.conf
- tools/relprep.py
Changes:
| 1 | +Tor Browser 13.5.25 - November 13 2025
|
|
| 2 | + * All Platforms
|
|
| 3 | + * Updated Tor to 0.4.8.20
|
|
| 4 | + * Bug 44335: Additional Security Fix Backport from Firefox 145 to esr115 [tor-browser]
|
|
| 5 | + |
|
| 1 | 6 | Tor Browser 13.5.24 - November 11 2025
|
| 2 | 7 | * All Platforms
|
| 3 | 8 | * Updated NoScript to 13.4
|
| ... | ... | @@ -21,7 +21,7 @@ var: |
| 21 | 21 | browser_series: '13.5'
|
| 22 | 22 | browser_rebase: 1
|
| 23 | 23 | browser_branch: '[% c("var/browser_series") %]-[% c("var/browser_rebase") %]'
|
| 24 | - browser_build: 2
|
|
| 24 | + browser_build: 3
|
|
| 25 | 25 | branding_directory_prefix: 'tb'
|
| 26 | 26 | copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
|
| 27 | 27 | nightly_updates_publish_dir: '[% c("var/nightly_updates_publish_dir_prefix") %]nightly-[% c("var/osname") %]'
|
| 1 | 1 | # vim: filetype=yaml sw=2
|
| 2 | 2 | filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.[% c("compress_tar") %]'
|
| 3 | -version: 0.4.8.19
|
|
| 3 | +version: 0.4.8.20
|
|
| 4 | 4 | git_hash: 'tor-[% c("version") %]'
|
| 5 | 5 | git_url: https://gitlab.torproject.org/tpo/core/tor.git
|
| 6 | 6 | git_submodule: 1
|
| ... | ... | @@ -73,11 +73,11 @@ buildconf: |
| 73 | 73 | git_signtag_opt: '-s'
|
| 74 | 74 | |
| 75 | 75 | var:
|
| 76 | - torbrowser_version: '13.5.24'
|
|
| 76 | + torbrowser_version: '13.5.25'
|
|
| 77 | 77 | torbrowser_build: 'build1'
|
| 78 | 78 | # This should be the date of when the build is started. For the build
|
| 79 | 79 | # to be reproducible, browser_release_date should always be in the past.
|
| 80 | - browser_release_date: '2025/11/10 09:45:05'
|
|
| 80 | + browser_release_date: '2025/11/12 11:00:00'
|
|
| 81 | 81 | browser_release_date_timestamp: '[% USE date; date.format(c("var/browser_release_date"), "%s") %]'
|
| 82 | 82 | browser_platforms:
|
| 83 | 83 | # is_android_release and is_desktop_release are used to quickly
|
| ... | ... | @@ -115,9 +115,9 @@ var: |
| 115 | 115 | updater_enabled: 1
|
| 116 | 116 | build_mar: 1
|
| 117 | 117 | torbrowser_incremental_from:
|
| 118 | + - 13.5.24
|
|
| 118 | 119 | - 13.5.23
|
| 119 | 120 | - 13.5.22
|
| 120 | - - 13.5.21
|
|
| 121 | 121 | mar_channel_id: '[% c("var/projectname") %]-torproject-[% c("var/channel") %]'
|
| 122 | 122 | |
| 123 | 123 | # By default, we sort the list of installed packages. This allows sharing
|
| ... | ... | @@ -626,32 +626,10 @@ class ReleasePreparation: |
| 626 | 626 | def update_rbm_conf(self):
|
| 627 | 627 | logger.info("Updating rbm.conf.")
|
| 628 | 628 | releases = {}
|
| 629 | - browsers = {
|
|
| 630 | - "tbb": '[% IF c("var/tor-browser") %]{}[% END %]',
|
|
| 631 | - "mb": '[% IF c("var/mullvad-browser") %]{}[% END %]',
|
|
| 632 | - }
|
|
| 633 | - incremental_from = []
|
|
| 634 | - for b in ["tbb", "mb"]:
|
|
| 635 | - for rel in self.last_releases[(b, self.version.channel)]:
|
|
| 636 | - if rel.version not in releases:
|
|
| 637 | - releases[rel.version] = {}
|
|
| 638 | - releases[rel.version][b] = str(rel.version)
|
|
| 639 | - for version in sorted(releases.keys(), reverse=True):
|
|
| 640 | - if len(releases[version]) == 2:
|
|
| 641 | - incremental_from.append(releases[version]["tbb"])
|
|
| 642 | - logger.debug(
|
|
| 643 | - "Building incremental from %s for both browsers.", version
|
|
| 644 | - )
|
|
| 645 | - else:
|
|
| 646 | - for b, template in browsers.items():
|
|
| 647 | - maybe_rel = releases[version].get(b)
|
|
| 648 | - if maybe_rel:
|
|
| 649 | - logger.debug(
|
|
| 650 | - "Building incremental from %s only for %s.",
|
|
| 651 | - version,
|
|
| 652 | - b,
|
|
| 653 | - )
|
|
| 654 | - incremental_from.append(template.format(maybe_rel))
|
|
| 629 | + incremental_from = [
|
|
| 630 | + str(r.version)
|
|
| 631 | + for r in self.last_releases[("tbb", self.version.channel)]
|
|
| 632 | + ]
|
|
| 655 | 633 | |
| 656 | 634 | separator = "\n--- |\n"
|
| 657 | 635 | path = self.base_path / "rbm.conf"
|