[tbb-commits] [tor-browser-build/master] Release prep for 11.5a2 (desktop only)

[gk at torproject.org]

commit e8436f2693dfb66fbe120448b91390b4ac180c2f
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jan 7 14:59:12 2022 +0000

    Release prep for 11.5a2 (desktop only)
    
    Version bumps and changelog update
---
 projects/firefox/config                            |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 26 ++++++++++++++++++++++
 projects/tor-browser/config                        |  4 ++--
 projects/tor/config                                |  2 +-
 rbm.conf                                           |  6 ++---
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index e180ee0..8556f6a 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 91.4.0
+  firefox_platform_version: 91.5.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 11.5
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index ad477dd..db93fe2 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,29 @@
+Tor Browser 11.5a2 - January 11 2022
+ * Windows + OS X + Linux
+   * Update Firefox to 91.5.0esr
+   * Update Tor to 0.4.7.3-alpha
+   * Update OpenSSL to 1.1.1m
+   * Update NoScript to 11.2.14
+   * Bug 40405: Rotate deusexmachina IP address [tor-browser-build]
+   * Bug 40645: Migrate Moat APIs to Moat.jsm module [tor-browser]
+   * Bug 40684: Misc UI bug fixes [tor-browser]
+   * Bug 40736: Disable third-party cookies in Private Browsing Mode [tor-browser]
+   * Bug 40756: Fix up wrong observer removals [tor-browser]
+   * Bug 40758: Remove YEC takeover from about:tor [torbutton]
+   * Translations update
+ * Windows
+   * Bug 40742: Remove workaround for fixing --disable-maintenance-service build bustage [tor-browser]
+   * Bug 40753: Revert fix for Youtube videos not playing on Windows [tor-browser]
+ * Linux
+   * Bug 40387: Fonts of the GUI do not render after update [tor-browser-build]
+   * Bug 40399: Bring back Noto Sans Gurmukhi and Sinhala fonts [tor-browser-build]
+   * Bug 40685: Monospace font in browser chrome [tor-browser]
+ * Build System
+   * Windows + OS X + Linux
+     * Bug 40345: Update Go to 1.17.5 [tor-browser-build]
+   * OS X
+     * Bug 40390: Remove workaround for macOS OpenSSL build breakage [tor-browser-build]
+
 Tor Browser 11.0.3 - December 20 2021
  * Windows + OS X + Linux
    * Update Firefox to 91.4.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 228b472..76823b6 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -78,9 +78,9 @@ input_files:
     enable: '[% ! c("var/android") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.11-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.14-an+fx.xpi
     name: noscript
-    sha256sum: b833e81823986646dbc473ebbee987bd47757fbe79c9d1720150f08ba6ca9ba9
+    sha256sum: 47399b94f57dde1162f74a49679c7cb3b6dfe684d4eee49842e65eae64e9982b
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/config b/projects/tor/config
index c25dd4d..d86f0bf 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.7.2-alpha
+version: 0.4.7.3-alpha
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index e09ee13..beb1e47 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -58,10 +58,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '11.5a1'
-  torbrowser_build: 'build2'
+  torbrowser_version: '11.5a2'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 11.0a10
+    - 11.5a1
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1