[tbb-commits] [tor-browser-build/maint-9.5] Release preparations for 9.5.2

[sysrqb at torproject.org]

commit b5fb6a531f4723c63eea4ff4ea58d56377578cb4
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Mon Jul 6 19:46:17 2020 +0000

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

diff --git a/projects/firefox/config b/projects/firefox/config
index 1398149..414097f 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") %]-1-build2'
+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: 68.10.0
+  firefox_platform_version: 68.10.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.5
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index c204a38..bd49a23 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 9.5.2 -- July 7 2020
+ * Android
+   * Update Firefox to 68.10.1esr
+
 Tor Browser 9.5.1 -- June 30 2020
  * All Platforms
    * Update Firefox to 68.10.0esr
diff --git a/rbm.conf b/rbm.conf
index c65d3a8..05ffcf2 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,8 +24,8 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5.1'
-  torbrowser_build: 'build2'
+  torbrowser_version: '9.5.2'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 9.5
   project_name: tor-browser