[tbb-commits] [tor-browser-build/maint-9.0] Preparing 9.0.4

[gk at torproject.org]

commit c9dc6d56b935098444d79d3b9234cff7cc25b5fb
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Jan 8 07:36:28 2020 +0000

    Preparing 9.0.4
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++
 rbm.conf                                            | 5 +++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index b6ddd17..f50af8c 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 68.4.0
+  firefox_platform_version: 68.4.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.0
   torbrowser_update_channel: alpha
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index c603a11..78dd726 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.0.4 -- January 9 2020
+ * All Platforms
+   * Update Firefox to 68.4.1esr
+
 Tor Browser 9.0.3 -- January 7 2020
  * All Platforms
    * Update Firefox to 68.4.0esr
diff --git a/rbm.conf b/rbm.conf
index 57e0aad..d8fccd1 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.0.3'
-  torbrowser_build: 'build4'
+  torbrowser_version: '9.0.4'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 9.0.2
+    - 9.0.3
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1