[tor-commits] [tor-browser-build/maint-10.0] Tor Browser 10.0.1 release preparations

[sysrqb at torproject.org]

commit 822525f34a96ed175071197c8bd0e7b997650074
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Oct 9 03:02:19 2020 +0000

    Tor Browser 10.0.1 release preparations
    
    Version bumps and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/go/config                                  |  4 ++--
 projects/openssl/config                             |  4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor-launcher/config                        |  2 +-
 rbm.conf                                            |  6 +++---
 7 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 189b02e..8c73b0d 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") %]-2-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/go/config b/projects/go/config
index 24ab09a..02525e7 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.14.7
+version: 1.14.9
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -118,7 +118,7 @@ input_files:
     enable: '[% ! c("var/linux") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
     name: go
-    sha256sum: 064392433563660c73186991c0a315787688e7c38a561e26647686f89b6c30e3
+    sha256sum: c687c848cc09bcabf2b5e534c3fc4259abebbfc9014dd05a1a2dc6106f404554
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
     name: go14
     sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/openssl/config b/projects/openssl/config
index 91b0f1c..8ed29db 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.1.1g
+version: 1.1.1h
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -31,6 +31,6 @@ input_files:
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-    sha256sum: ddb04774f1e32f0c49751e21b67216ac87852ceb056b75209af2443400636d46
   - filename: use-SOURCE_DATE_EPOCH.patch
     enable: '[% c("var/windows") %]'
+    sha256sum: 5c9ca8774bd7b03e5784f26ae9e9e6d749c9da2438545077e6b3d755a06595d9
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index ce725b3..8d3cdb9 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,20 @@
+Tor Browser 10.0.1 -- October 13 2020
+ * Windows + OS X + Linux
+   * Update NoScript to 11.1.1
+   * Update Tor Launcher to 0.2.26
+   * Bug 31767: Avoid using intl.locale.requested pref directly
+   * Bug 40013: End of year 2020 Fundraising campaign [torbutton]
+   * Bug 40016: Fix onion pattern for LTR locales [torbutton]
+   * Bug 40139: Update Onboarding icon for 10.0 [tor-browser]
+   * Bug 40148: Disable Picture-in-Picture until we investigate and possibly fix it [tor-browser]
+   * Translations update
+ * Windows
+   * Bug 40140: Videos stop working with Tor Browser 10.0 on Windows
+ * Build System
+   * Windows + OS X + Linux
+     * Bump Go to 1.14.9
+     * Bump openssl to 1.1.1h
+
 Tor Browser 10.0 -- September 22 2020
  * Windows + OS X + Linux
    * Update Firefox to 78.3.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 8bb1a67..e9a17d5 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.0.44-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.1.1-an+fx.xpi
     name: noscript
-    sha256sum: 3b768fa45f94bed9c58962bd7c0c11bc431e639aeedb2e91c7d8303df5fc84ae
+    sha256sum: bdc99f11a75ea050934b692c8717c363493d5f717397ba9ef35b1a2e9078516c
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index f8828db..0c9698a 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.25
+version: 0.2.26
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index c1332dd..8ece479 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0'
-  torbrowser_build: 'build3'
+  torbrowser_version: '10.0.1'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5.4
+    - 10.0
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1