[tbb-commits] [tor-browser-build/maint-11.0] Pick up a few more fixes for 11.0.2

[sysrqb at torproject.org]

commit 7d9eb93e0f6bd6eaf4346e56f3b260406091fd95
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Dec 3 19:52:18 2021 +0000

    Pick up a few more fixes for 11.0.2
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 ++
 rbm.conf                                            | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index ad0ed52..6cf70db 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,8 @@
 Tor Browser 11.0.1 - December 7 2021
  * Windows + OS X + Linux
    * Update Firefox to 91.4.0esr
+   * Bug 40318: Remove check for DISPLAY env var in start-tor-browser [tor-browser-build]
+   * Bug 40386: Add new default obfs4 bridge "deusexmachina" [tor-browser-build]
    * Bug 40682: Disable network.proxy.allow_bypass [tor-browser]
  * Linux
    * Bug 40387: Remove some fonts on Linux [tor-browser-build]
diff --git a/rbm.conf b/rbm.conf
index 3a32f8b..b1c49f2 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -58,7 +58,7 @@ buildconf:
 
 var:
   torbrowser_version: '11.0.2'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 11.0.1
   project_name: tor-browser