[tbb-commits] [tor-browser-build/master] Release preparations for 11.0a7

[sysrqb at torproject.org]

commit 6f39bfb567e775cfae831b46bc09fee0dbb2b5f6
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Sep 7 22:58:38 2021 +0000

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

diff --git a/projects/firefox/config b/projects/firefox/config
index 7936e09..07af41b 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/firefox_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:
-  firefox_platform_version: 78.13.0
+  firefox_platform_version: 78.14.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 11.0
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/openssl/config b/projects/openssl/config
index 96dbfbf..f0f6ef3 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.1.1k
+version: 1.1.1l
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -31,6 +31,6 @@ input_files:
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-    sha256sum: 892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5
+    sha256sum: 0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1
   - filename: 0001-Revert-apple-getentropy-removal.patch
     enable: '[% c("var/osx") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index b74f7a5..22665e5 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.0a7 -- September 10 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.14.0esr
+   * Bug 40597: Implement TorSettings module [tor-browser]
+* OS X
+   * Bug 40358: Make OpenSSL 1.1.1l buildable for macOS [tor-browser-build]
+
 Tor Browser 11.0a6 -- September 2 2021
  * Android
    * Bug 40611: Rebase geckoview patches onto 92.0b9 [tor-browser]
diff --git a/rbm.conf b/rbm.conf
index 1d6effc..50de75b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -57,10 +57,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '11.0a6'
+  torbrowser_version: '11.0a7'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 11.0a4
+    - 11.0a5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1