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/4dd8aa838af3ecdcb77bfa5a03912bac7ace15a5

-- 
View it on GitLab: 
https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4dd8aa838af3ecdcb77bfa5a03912bac7ace15a5
You're receiving this email because of your account on gitlab.torproject.org.


_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to