[tor-browser-build/master] Release preparations for 10.0a1 - tor-commits

29 May 2020

commit db927811143f4f124f24b435adf477f19fa306c2
Author: Matthew Finkel sysrqb@torproject.org
Date:   Fri May 29 21:25:47 2020 +0000
Release preparations for 10.0a1
Versions bump and Changelog update.
---
 projects/firefox-langpacks/config                  |  2 +-
 projects/firefox-locale-bundle/config              |  2 +-
 projects/firefox/config                            |  6 +++---
 projects/https-everywhere/config                   |  2 +-
 projects/tba-translation/config                    |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 22 ++++++++++++++++++++++
 projects/tor-launcher/config                       |  2 +-
 rbm.conf                                           |  6 +++---
 8 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 17a707a..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: build2
+  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 2ea6db6..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: build2
+  ff_build: build1
diff --git a/projects/firefox/config b/projects/firefox/config
index 272634d..a64763e 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,16 +1,16 @@
 # 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-build2'
+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.8.0
+  firefox_platform_version: 68.9.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
-  torbrowser_branch: 9.5
+  torbrowser_branch: 10.0
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 7e5aa51..a5be759 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2020.3.16
+version: 2020.5.20
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index 29388a4..ab5c04e 100644
--- a/projects/tba-translation/config
+++ b/projects/tba-translation/config
@@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.torproject.org/translation.git
 # We need to bump the commit before releasing but just pointing to a branch
 # might cause too much rebuidling of the Firefox part.
-git_hash: d3df6cc6e1797733ebca5b370f0f6915f490666f
+git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index ab1c7b8..a4e261c 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,25 @@
+Tor Browser 10.0a1 -- June 2 2020
+ * All Platforms
+   * Update Firefox to 68.9.0esr
+   * Update HTTPS-Everywhere to 2020.5.20
+   * Translations update
+ * Windows + OS X + Linux
+   * Update Tor Launcher to 0.2.21.8
+     * Translations update
+   * Bug 34321: Add Learn More onboarding item
+ * Linux
+   * Bug 34315: Avoid reading policies from /etc/firefox on Linux
+ * Android
+   * Bug 30318: Integrate snowflake into mobile Tor Browser
+   * Bug 34219: Enable ZSTD support properly for Android
+ * Build System
+   * Windows
+     * Bug 31128: Move Windows containers to Debian 10
+   * Mac OS X
+     * Bug 31129: Move macOS containers to Debian 10
+   * Android
+     * Bug 28672: Android reproducible build of Snowflake
+
 Tor Browser 9.5a13 -- May 20 2020
  * All Platforms
    * Bump NoScript to 11.0.26
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index eb4dc24..9aaca27 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.21.7
+version: 0.2.21.8
 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 f2d0f4f..d0afe9a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
var:
-  torbrowser_version: '9.5a13'
-  torbrowser_build: 'build2'
+  torbrowser_version: '10.0a1'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5a12
+    - 9.5a13
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

    