[tbb-commits] [tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.17

[sysrqb at torproject.org]

commit abf8891d2546d37a8b44fabe38a46aa84207d37e
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Wed May 26 22:57:44 2021 +0000

    Release preparation for 10.0.17
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/https-everywhere/config                    |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  5 ++---
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index e5baf06..18cd434 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 78.10.0
+  firefox_platform_version: 78.11.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 5ef51dd..c5b31f7 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2021.1.27
+version: 2021.4.15
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 59c6316..9af7938 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,13 @@
+Tor Browser 10.0.17 -- June 1 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.11.0esr
+   * Update HTTPS Everywhere to 2021.4.15
+   * Update NoScript to 11.2.8
+   * Update Tor to 0.4.5.8
+   * Bug 27002: (Mozilla 1673237) Always allow SVGs on about: pages [tor-browser]
+   * Bug 40432: Prevent probing installed applications [tor-browser]
+   * Bug 40037: Announce v2 onion service deprecation on about:tor [torbutton]
+
 Tor Browser 10.0.16 -- April 20 2021
  * Windows + OS X + Linux
    * Update Firefox to 78.10.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 2c4575c..de3df86 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -77,9 +77,9 @@ input_files:
     enable: '[% c("var/snowflake") && ! c("var/android") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.4-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.8-an+fx.xpi
     name: noscript
-    sha256sum: 278ee526d7c3ce5236c1a04aa5b6605c81b82399b846e43cdf6f93f11fef1ec9
+    sha256sum: 4744f9d99acbe9dec3557765edd9173272b4681c8425228fb6af52493f853467
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/config b/projects/tor/config
index edd6391..bef0afc 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.5.7
+version: 0.4.5.8
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index e40f731..7cd3dec 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.16'
+  torbrowser_version: '10.0.17'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.0.14
-    - 10.0.15
+    - 10.0.16
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1