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

[sysrqb at torproject.org]

commit 4338e5ea7c4641dcdcac44120df00fb0af7bebdb
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Sep 11 16:01:45 2020 +0000

    Release preparations for 10.0a7
    
    Versions bump and Changelog update
---
 projects/firefox/config                            |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 26 ++++++++++++++++++++++
 projects/tor-browser/config                        |  4 ++--
 projects/tor-launcher/config                       |  2 +-
 rbm.conf                                           |  6 ++---
 5 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 41802bc..b0a58fb 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/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index bc71bc9..6f70249 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,29 @@
+Tor Browser 10.0a7 -- September 14 2020
+ * Windows + OS X + Linux
+   * Update Tor Launcher to 0.2.24
+   * Update NoScript to 11.0.43
+   * Translations update
+   * Bug 32017: Use ExtensionStorageIDB again
+   * Bug 40006: Fix new identity for 81 [torbutton]
+   * Bug 40007: Move SecurityPrefs initialization to the StartupObserver component [torbutton]
+   * Bug 40008: Style fixes for 78 [torbutton]
+   * Bug 40066: Remove default bridge 37.218.240.34 [tor-browser-build]
+   * Bug 40073: Repack omni.ja to include builtin HTTPS Everywhere [tor-browser-build]
+   * Bug 40091: Load HTTPS Everywhere as a builtin addon [tor-browser]
+   * Bug 40102: Fix UI bugs in Tor Browser 10.0 alpha [tor-browser]
+   * Bug 40109: Playing video breaks after reloading pages [tor-browser]
+   * Big 40119: Enable v3 extension blocklisting again [tor-browser]
+ * Build System
+   * Windows + OS X + Linux
+     * Bump Go to 1.14.7
+     * Bug 40031: Add licenses for kcp-go and smux. [tor-browser-build]
+     * Bug 40065: Bump debootstrap-image ubuntu_version to 20.04.1 [tor-browser-build]
+     * Bug 40045: Fix complete .mar file creation for dmg2mar [tor-browser-build]
+   * Windows
+     * Bug 40052: Bump NSIS to 3.06.1 [tor-browser-build]
+     * Bug 40071: Be explicit about no SEH with mingw-w64 on 32bit systems [tor-browser-build]
+     * Bug 40077: Don't pass --no-insert-timestamp when building Firefox [tor-browser-build]
+
 Tor Browser 10.0a6 -- August 26 2020
  * All Platforms
    * Update HTTPS Everywhere to 2020.08.13
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 6398323..7c2baba 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.39-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.43-an+fx.xpi
     name: noscript
-    sha256sum: d0ade42bee14ea2498cf8868c2d0ef2d5acae563d22cb788b33a86b80e7f7b5e
+    sha256sum: 79395f62e7df98813847e1ffb28ec33e8271dbf826646b022917d13126a29414
   - 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 95a2f02..91c181e 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.23
+version: 0.2.24
 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 9ee4f18..7cf5369 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0a6'
-  torbrowser_build: 'build2'
+  torbrowser_version: '10.0a7'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.0a5
+    - 10.0a6
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1