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

[sysrqb at torproject.org]

commit 1cd062accca99cfd6f65e367c41e4d4054878472
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Mar 3 20:44:57 2020 +0000

    Release preparations for 9.5a7
    
    Versions bump and Changelog update
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++
 projects/tor-launcher/config                        | 2 +-
 rbm.conf                                            | 3 ++-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index d101697..5d6c05d 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # 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") %]-1-build3'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index bdddb44..217d0b4 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,11 @@
+Tor Browser 9.5a7 -- March 6 2020
+ * All Platforms
+   * Translations update
+ * Windows + OS X + Linux
+   * Update Tor Launcher to 0.2.21.3
+     * Translations update
+     * Bug 33514: non-en-US Tor Browser 9.5a6 won't start up
+
 Tor Browser 9.5a6 -- February 27 2020
  * All Platforms
    * Translations update
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index f96c10f..84c5b17 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.21.2
+version: 0.2.21.3
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index d7a11c6..ed91b10 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,12 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5a6'
+  torbrowser_version: '9.5a7'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 9.5a4
     - 9.5a5
+    - 9.5a6
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1