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

[gk at torproject.org]

commit c3a8697358b03386ddc3f516a82226396a8f47df
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Oct 15 20:37:50 2020 +0000

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

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 34d6fad..17a707a 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: build1
+  ff_build: build2
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox/config b/projects/firefox/config
index 8db58d5..9d08d8c 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # 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") %]-2-build4'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-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: 78.3.0
+  firefox_platform_version: 78.4.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 890aace..ac85f33 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tor Browser 10.0.2 -- October 20 2020
+ * Windows + OS X + Linux
+   * Update Firefox to 78.4.0esr
+   * Update NoScript to 11.1.3
+   * Bug 40192: Backport Mozilla Bug 1658881
+   * Translations update
+
 Tor Browser 10.0.1 -- October 13 2020
  * Windows + OS X + Linux
    * Update NoScript to 11.1.1
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index e9a17d5..8b201f8 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.1-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.1.3-an+fx.xpi
     name: noscript
-    sha256sum: bdc99f11a75ea050934b692c8717c363493d5f717397ba9ef35b1a2e9078516c
+    sha256sum: 08543e4a03e0becacd10c3cdbf5eaab1ff35a1648babe6f1522ae335e21de7d4
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 0530620..218f8ef 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.1'
-  torbrowser_build: 'build2'
+  torbrowser_version: '10.0.2'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.0
+    - 10.0.1
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1