[tbb-commits] [tor-browser-build/maint-8.0] Release preparations for 8.0.9

[gk at torproject.org]

commit d48ca8aa4c5c5ad4a1285dfa102eab080776427c
Author: Georg Koppen <gk at torproject.org>
Date:   Sun May 5 06:26:01 2019 +0000

    Release preparations for 8.0.9
    
    Picking up hotfix for 30388
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++
 projects/tor-browser/config                         | 4 ++--
 rbm.conf                                            | 5 ++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index dcc20c4..2d0712e 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") %]-1-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 0fed743..197b951 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tor Browser 8.0.9 -- May 6 2019
+* All platforms
+  * Backport fixes for bug 1549010 and bug 1549061
+    * Bug 30388: NoScript and all user-installed add-ons got deactivated
+  * Update NoScript to 10.6.1
+     * Bug 29872: XSS popup with DuckDuckGo search on about:tor
+
 Tor Browser 8.0.8 -- March 22 2019
  * All platforms
    * Update Firefox to 60.6.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 6aa3c66..94957d3 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -74,9 +74,9 @@ input_files:
     name: snowflake
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.2.5-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.6.1-an+fx.xpi
     name: noscript
-    sha256sum: b486b8c224882652b00b81a3e4a52389ed8b55035f8f09fec930a36b7477ac2e
+    sha256sum: b15047d0045d12f28b2e1e444bdb86800257b5ca6cc8f4c8022b20c550cd9727
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index f63c3a1..f46ece9 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,11 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.0.8'
+  torbrowser_version: '8.0.9'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 8.0.6
-    - 8.0.7
+    - 8.0.8
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1