[tbb-commits] [tor-browser-build/master] Release preparations for 10.5a17

[sysrqb at torproject.org]

commit f69f3f0f98b63f98a04613f0f1003d88909631cd
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Jun 24 21:09:36 2021 +0000

    Release preparations for 10.5a17
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/go/config                                  |  4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor-launcher/config                        |  2 +-
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  4 ++--
 7 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index e5ba431..564e374 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
 git_submodule: 1
diff --git a/projects/go/config b/projects/go/config
index ec6ed92..8a67ae8 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.15.12
+version: 1.15.13
 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: 1c6911937df4a277fa74e7b7efc3d08594498c4c4adc0b6c4ae3566137528091
+    sha256sum: 99069e7223479cce4553f84f874b9345f6f4045f27cf5089489b546da619a244
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
     name: go14
     sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 56f83a7..9c94409 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,21 @@
+Tor Browser 10.5a17 -- June 27 2021
+ * All Platforms
+   * Update NoScript to 11.2.9
+   * Update Tor to 0.4.6.5
+   * Update Tor Launcher to 0.2.29
+ * Windows + OS X + Linux
+   * Bug 34345: "Don't Bootstrap" Startup Mode
+   * Bug 40302: Update version of snowflake [tor-browser-build]
+   * Bug 40455: Block or recover background requests after bootstrap [tor-browser]
+   * Bug 40456: Update the SecureDrop HTTPS-Everywhere update channel [tor-browser]
+   * Bug 40475: Include clearing CORS preflight cache [tor-browser]
+   * Bug 40478: Onion alias url rewrite is broken [tor-browser]
+ * Build System
+   * All Platforms
+     * Update Go to 1.15.13
+   * Android
+     * Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies [tor-browser-build]
+
 Tor Browser 10.5a16 -- June 5 2021
  * All Platforms
    * Update NoScript to 11.2.8
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 65fbc66..f98062e 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -78,9 +78,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.8-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.9-an+fx.xpi
     name: noscript
-    sha256sum: 4744f9d99acbe9dec3557765edd9173272b4681c8425228fb6af52493f853467
+    sha256sum: 830a25dad07327ae220b4740ea834b0abe715e9ef3dabc326bf7fef2c5af1efb
   - 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 1ebf3e1..e349026 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.28
+version: 0.2.29
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index c7dd6ef..9d0c625 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.6.4-rc
+version: 0.4.6.5
 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 9a9339f..5304c0a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -57,10 +57,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.5a16'
+  torbrowser_version: '10.5a17'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.5a15
+    - 10.5a16
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1