[tor-commits] [tor-browser-build/maint-11.0] Release preparations for 11.0.4

[gk at torproject.org]

commit 72c96508bde81a77f856e17b03e2b4d70671e6c6
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jan 6 20:31:18 2022 +0000

    Release preparations for 11.0.4
    
    Version bumps and changelog update
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++
 projects/tor-browser/config                         |  4 ++--
 rbm.conf                                            |  4 ++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 6a76a73..032075d 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,13 @@
+Tor Browser 11.0.4 - January 11 2022
+ * Windows + OS X + Linux
+   * Update Firefox to 91.5.0esr
+   * Update NoScript to 11.2.14
+   * Bug 40405: Rotate deusexmachina IP address [tor-browser-build]
+   * Bug 40756: Fix up wrong observer removals [tor-browser]
+   * Bug 40758: Remove YEC takeover from about:tor [torbutton]
+ * Linux
+   * Bug 40399: Bring back Noto Sans Gurmukhi and Sinhala fonts [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/rbm.conf b/rbm.conf
index 30c021c..f3bc10f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -57,10 +57,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '11.0.3'
+  torbrowser_version: '11.0.4'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 11.0.2
+    - 11.0.3
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1