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

[sysrqb at torproject.org]

commit 36455baf5bc29c3f256a055cdac0a83563e5c0fa
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Apr 28 15:40:45 2020 +0000

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

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 2d55896..34d6fad 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: build3
+  ff_build: build1
   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 b2d33a8..2f4997f 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: build3
+  ff_build: build1
diff --git a/projects/firefox/config b/projects/firefox/config
index 8ee8817..75efe0d 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") %]-2-build1'
+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.7.0
+  firefox_platform_version: 68.8.0
   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 7e24574..b0b7a8c 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,8 @@
+Tor Browser 9.0.10 -- May 5 2020
+ * All Platforms
+   * Update Firefox to 68.8.0esr
+   * Bump NoScript to 11.0.25
+
 Tor Browser 9.0.9 -- April 7 2020
  * All Platforms
    * Update Firefox to 68.7.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 6f2f436..22d0bb8 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -73,9 +73,9 @@ input_files:
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.23-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.25-an+fx.xpi
     name: noscript
-    sha256sum: 3f046da13f487392f34858f8a5e2fc24d7d87ff19e98a3a7907f59baff8a3705
+    sha256sum: 2e55cf6dc6d0f6012e2f0328ecfec182a4f02c94e2fc40818af41f610ebd6668
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 5b7db99..e23a15b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.0.9'
+  torbrowser_version: '9.0.10'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.0.7
-    - 9.0.8
+    - 9.0.9
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1