From c92c6b966c500eaee4f88ee39b5b38cb6fee621a Mon Sep 17 00:00:00 2001
From: Richard Pospesel <richard@torproject.org>
Date: Mon, 18 Mar 2024 21:30:24 +0000
Subject: [PATCH] Bug 41084: Prepare Tor Browser 13.0.12 Part 2
---
projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt | 6 ++++--
projects/firefox/config | 5 ++++-
projects/geckoview/config | 2 +-
projects/translation/config | 6 +++---
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt b/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
index 24e8d4bd0..e831eaea5 100644
--- a/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
+++ b/projects/browser/Bundle-Data/Docs-TBB/ChangeLog.txt
@@ -1,17 +1,19 @@
Tor Browser 13.0.12 - March 19 2024
* All Platforms
+ * Updated Snowflake to 2.9.2
* Bug 42376: The placeholder of datetime inputs keeps being localized when spoof English is on [tor-browser]
* Bug 42378: spoof english + htmlform <details> can leak app language [tor-browser]
* Bug 42444: Remove the "Prioritize .onion sites when known" option [tor-browser]
* Bug 42448: Rebase Tor Browser stable onto Firefox 115.9.0esr [tor-browser]
* Bug 42459: Add startpage onion service to list of search providers [tor-browser]
+ * Bug 41105: Bump version of snowflake to v2.9.2 [tor-browser-build]
* Windows + macOS + Linux
* Updated Firefox to 115.9.0esr
+ * Windows
+ * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser]
* Android
* Updated GeckoView to 115.9.0esr
* Bug 42407: TTP-03-010 WP3: Potential phishing [tor-browser]
- * Windows
- * Bug 42377: Hidden fonts are automatically added to the allow list [tor-browser]
* Build System
* All Platforms
* Updated Go to 1.21.8
diff --git a/projects/firefox/config b/projects/firefox/config
index 8cc93fa12..167e95d33 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -18,7 +18,9 @@ var:
firefox_version: '[% c("var/firefox_platform_version") %]esr'
browser_series: '13.0'
browser_branch: '[% c("var/browser_series") %]-1'
- browser_build: 2
+ # update the mullvadbrowser specific override for 115.10.0
+ # torbrowser had an extra firefox build tag
+ 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") %]'
@@ -102,6 +104,7 @@ targets:
mullvadbrowser:
git_url: https://gitlab.torproject.org/tpo/applications/mullvad-browser.git
var:
+ browser_build: 2
branding_directory_prefix: 'mb'
gitlab_project: https://gitlab.torproject.org/tpo/applications/mullvad-browser
updater_url: 'https://cdn.mullvad.net/browser/update_responses/update_1/'
diff --git a/projects/geckoview/config b/projects/geckoview/config
index 7ae6b3207..8656851c7 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -16,7 +16,7 @@ container:
var:
geckoview_version: 115.9.0esr
browser_branch: 13.0-1
- browser_build: 2
+ browser_build: 3
copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
gitlab_project: https://gitlab.torproject.org/tpo/applications/tor-browser
git_commit: '[% exec("git rev-parse HEAD") %]'
diff --git a/projects/translation/config b/projects/translation/config
index 311c63fab..26b720321 100644
--- a/projects/translation/config
+++ b/projects/translation/config
@@ -12,13 +12,13 @@ compress_tar: 'gz'
steps:
base-browser:
base-browser: '[% INCLUDE build %]'
- git_hash: 595dcd5efe752cddc1b6ba47082ad9f5f4917fee
+ git_hash: a4d224e82808529e135259e04fb58fb39b90da2d
targets:
nightly:
git_hash: 'base-browser'
tor-browser:
tor-browser: '[% INCLUDE build %]'
- git_hash: 9b6914a85be61ad6975e8bf483d4484d39bf5f7a
+ git_hash: e7aabc54138211e23bc60af1abe492c8bc68ce4b
targets:
nightly:
git_hash: 'tor-browser'
@@ -32,7 +32,7 @@ steps:
fenix: '[% INCLUDE build %]'
# We need to bump the commit before releasing but just pointing to a branch
# might cause too much rebuidling of the Firefox part.
- git_hash: 7374fbc72d2c37a4d5354447dec3b5c543fd0380
+ git_hash: ef6bef5e373108c4e633998b517e4bc8c297770a
compress_tar: 'zst'
targets:
nightly:
--
GitLab