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

[gk at torproject.org]

commit 206e4c50c73d7fce303d55ebd2723c6dd9337301
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Dec 8 23:33:08 2020 +0000

    Tor Browser 10.0.7 release preparations
    
    Version bumps and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/https-everywhere/config                    |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++
 rbm.conf                                            |  5 +++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 4479b40..750ae24 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.5.0
+  firefox_platform_version: 78.6.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 90d7e41..255d36f 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2020.8.13
+version: 2020.11.17
 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 d5027f4..9a019e5 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,16 @@
+Tor Browser 10.0.7 -- December 15 2020
+ * Windows + OS X + Linux
+   * Update Firefox to 78.6.0esr
+   * Update HTTPS Everywhere to 2020.11.17
+   * Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots [tor-browser]
+   * Bug 40176: Update openssl to 1.1.1i [tor-browser-build]
+ * Linux
+   * Bug 40226: Crash on Fedora Workstation Rawhide GNOME [tor-browser]
+ * Build System
+   * Windows + OS X + Linux
+     * Bug 40139: Pick up rbm commit for bug 40008 [tor-browser-build]
+     * Bug 40161: Update Go compiler to 1.14.13 [tor-browser-build]
+
 Tor Browser 10.0.6 -- December 8 2020
  * Windows + OS X + Linux
    * Bug 40175: Update obfs4proxy's TLS certificate public key pinning [tor-browser-build]
diff --git a/rbm.conf b/rbm.conf
index 9e1db9a..3e49c09 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.6'
-  torbrowser_build: 'build2'
+  torbrowser_version: '10.0.7'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.0.5
+    - 10.0.6
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1