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

[sysrqb at torproject.org]

commit 80a73f38e6a3720ed83518e86a74d68690b277f8
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Dec 2 14:19:29 2021 +0000

    Release preparations for 11.0.2
    
    Version and Changelog updates
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++
 rbm.conf                                            | 5 ++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 249c2c7..36f39fb 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.3.0
+  firefox_platform_version: 91.4.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 11.0
   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 a542294..ad0ed52 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tor Browser 11.0.1 - December 7 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 91.4.0esr
+   * Bug 40682: Disable network.proxy.allow_bypass [tor-browser]
+ * Linux
+   * Bug 40387: Remove some fonts on Linux [tor-browser-build]
+
 Tor Browser 11.0.1 - November 14 2021
  * Windows + OS X + Linux
    * Tor Launcher 0.2.32
diff --git a/rbm.conf b/rbm.conf
index 2ba2ac0..208413e 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -57,11 +57,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '11.0.1'
+  torbrowser_version: '11.0.2'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.5.10
-    - 11.0
+    - 11.0.1
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1