[tor-commits] [tor-browser-build/master] Tag build2

[sysrqb at torproject.org]

commit 9fdc324d0d92dc235608e070d273d196e4444ce1
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Wed Sep 8 16:40:21 2021 +0000

    Tag build2
---
 projects/geckoview/config                           | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++
 rbm.conf                                            | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/projects/geckoview/config b/projects/geckoview/config
index e25939e..fba0d9b 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -1,14 +1,14 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
+git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  geckoview_version: 92.0b9
+  geckoview_version: 92.0
   torbrowser_branch: 11.0
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 22665e5..ee52bb3 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,7 +1,11 @@
 Tor Browser 11.0a7 -- September 10 2021
+ * All Platforms
+   * Update Openssl to 1.1.1l
  * Windows + OS X + Linux
    * Update Firefox to 78.14.0esr
    * Bug 40597: Implement TorSettings module [tor-browser]
+ * Android
+   * Bug 40611: Rebase geckoview patches onto 92.0 [tor-browser]
 * OS X
    * Bug 40358: Make OpenSSL 1.1.1l buildable for macOS [tor-browser-build]
 
diff --git a/rbm.conf b/rbm.conf
index 50de75b..d231de1 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -58,7 +58,7 @@ buildconf:
 
 var:
   torbrowser_version: '11.0a7'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 11.0a4
     - 11.0a5