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

[sysrqb at torproject.org]

commit 2f0eab871eef193fdb44d24020c47460afef03f8
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sun Nov 8 15:15:26 2020 +0000

    Tor Browser 10.0.4 release preparations
    
    Version bumps and Changelog update
---
 projects/geckoview/config                           |  2 +-
 projects/go/config                                  |  4 ++--
 projects/tba-translation/config                     |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++
 projects/tor-browser/config                         |  4 ++--
 rbm.conf                                            |  2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/projects/geckoview/config b/projects/geckoview/config
index 9b33603..67c8986 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  geckoview_version: 82.0
+  geckoview_version: 82.0.3
   torbrowser_branch: 10.0
   copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]'
   deps:
diff --git a/projects/go/config b/projects/go/config
index 5a18dd8..124be1f 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.14.10
+version: 1.14.11
 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: b37699a7e3eab0f90412b3969a90fd072023ecf61e0b86369da532810a95d665
+    sha256sum: 1871f3d29b0cf1ebb739c9b134c9bc559282bd3625856e5f12f5aea29ab70f16
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
     name: go14
     sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index 352c1c9..b2def42 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: f6d055376d53c41f729aff50c2960f479012b6dc
+git_hash: 96c5386d045d7413c4e208337aed7465fb0a666d
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 7c3be93..b630c03 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,15 @@
+Tor Browser 10.0.4 -- November 9 2020
+ * Android
+   * Update NoScript to 11.1.5
+   * Bug 40022: EOY November Update - Matching [torbutton]
+   * Bug 40106: EOY November Update - Matching [fenix]
+   * Bug 40219: Backport Mozilla Bug 1675905 [tor-browser]
+   * Translations update
+ * Build System
+   * Android
+     * Update Go to 1.14.11
+     * Bug 40141: Include "android" in signed tag [tor-browser-build]
+
 Tor Browser 10.0.3 -- November 2 2020
  * Android
    * Update Fenix to 82.1.1
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 9b31dfc..3d8e92d 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.1.4-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.1.5-an+fx.xpi
     name: noscript
-    sha256sum: 29738b77ecfa806679211e630c29ba1cff57ba22d713c35d4d7b5ed99f1f7d8c
+    sha256sum: 04ca69c90502f3b66cd18a4f832cb915b789b147ffd946b48f1dfb1215eb5398
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index fb03a23..565b05d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,7 +24,7 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.3'
+  torbrowser_version: '10.0.4'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.5a1