[tor-commits] [tor-browser-build/maint-9.0] Release preparations for 9.0.9

[sysrqb at torproject.org]

commit 6259714c939aeba44e9861986930881adb013413
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sat Apr 4 04:21:38 2020 +0000

    Release preparations for 9.0.9
    
    Versions bump and Changelog update. Version 9.0.8 was used for a
    security release.
---
 projects/firefox-langpacks/config                   | 2 +-
 projects/firefox-locale-bundle/config               | 2 +-
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 +++-
 rbm.conf                                            | 5 +++--
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 34d6fad..2d55896 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build3
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config
index 2f4997f..b2d33a8 100644
--- a/projects/firefox-locale-bundle/config
+++ b/projects/firefox-locale-bundle/config
@@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 var:
   use_container: 0
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build1
+  ff_build: build3
diff --git a/projects/firefox/config b/projects/firefox/config
index 9b27590..8ee8817 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-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
 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 72c645d..00e36da 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,4 +1,4 @@
-Tor Browser 9.0.8 -- April 7 2020
+Tor Browser 9.0.9 -- April 7 2020
  * All Platforms
    * Update Firefox to 68.7.0esr
    * Bump NoScript to 11.0.23
@@ -6,6 +6,8 @@ Tor Browser 9.0.8 -- April 7 2020
  * Windows + OS X + Linux
    * Bug 33771: Update some existing licenses and add Libevent license
    * Bug 33723: Bump openssl version to 1.1.1f
+ * Windows
+   * Bug 33805: Remove escape-openssldir.patch
 
 Tor Browser 9.0.7 -- March 20 2020
  * All Platforms
diff --git a/rbm.conf b/rbm.conf
index 3d86fee..5b7db99 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.0.8'
-  torbrowser_build: 'build3'
+  torbrowser_version: '9.0.9'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 9.0.7
+    - 9.0.8
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1