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

[sysrqb at torproject.org]

commit 02ad765bc59ad20ed2016489826a9edd1e0ad069
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Feb 21 21:58:37 2020 +0000

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

diff --git a/projects/firefox/config b/projects/firefox/config
index 45a33a0..d101697 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-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
 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 51405b3..bdddb44 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,17 @@
+Tor Browser 9.5a6 -- February 27 2020
+ * All Platforms
+   * Translations update
+ * Windows + OS X + Linux
+   * Update Tor Launcher to 0.2.21.2
+     * Translations update
+     * Bug 19757: Support on-disk storage of v3 client auth keys
+   * Bug 19757: Support on-disk storage of v3 client auth keys
+   * Bug 32493: Disable MOZ_SERVICES_HEALTHREPORT
+   * Bug 32658: Create a new MAR signing key
+ * Build System
+   * All Platforms
+     * Bug 33380: Add *.json to sha256sums-unsigned-build.txt
+
 Tor Browser 9.5a5 -- February 12 2020
  * All Platforms
    * Update Firefox to 68.5.0esr
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index fec0612..f96c10f 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.21.1
+version: 0.2.21.2
 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 f5f35c1..97b7850 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5a5'
-  torbrowser_build: 'build2'
+  torbrowser_version: '9.5a6'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 9.5a4
+    - 9.5a5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1