[tor-commits] [tor-browser-build/maint-9.0] Changelog update and 9.0.3 version bump

[sysrqb at torproject.org]

commit ba296259348266b9cf3fbb50b24bd47731091bc9
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sat Jan 4 02:07:15 2020 +0000

    Changelog update and 9.0.3 version bump
---
 projects/firefox-langpacks/config                   |  2 +-
 projects/firefox-locale-bundle/config               |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor-launcher/config                        |  2 +-
 rbm.conf                                            |  6 +++---
 6 files changed, 26 insertions(+), 8 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/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 38cfd3f..0fe2aa1 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,21 @@
+Tor Browser 9.0.3 -- January 7 2019
+ * All Platforms
+   * Update Firefox to 68.4.0esr
+   * Bump NoScript to 11.0.11
+   * Translations update
+   * Update OpenPGP keyring
+   * Bug 27268: Preferences clean-up in Torbutton code
+   * Bug 32606: Set up default bridge at Georgetown University
+   * Bug 32659: Remove IPv6 address of default bridge
+   * Bug 32547: Add new default bridge at UMN
+   * Bug 31855: Remove End of Year Fundraising Campaign from about:tor
+   * Bug 32674: Point the about:tor "Get involved" link to the community portal
+ * Android
+   * Bug 32405: Crash immediately after bootstrap on Android
+ * Build System
+   * Windows + OS X + Linux
+     * Bug 32676: Create a tarball with all Linux x86_64 language packs
+
 Tor Browser 9.0.2 -- December 3 2019
  * All Platforms
    * Update Firefox to 68.3.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 819ebad..c4de769 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -73,9 +73,9 @@ input_files:
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.9-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.11-an+fx.xpi
     name: noscript
-    sha256sum: 1522903c3486c790e842f9d5204cfbc93672676df4090f99c4d1ee3578ac8c07
+    sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5
   - 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 5eef2e2..dd881c1 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.20.2
+version: 0.2.20.4
 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 de42014..6fc8ed6 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.0.2'
-  torbrowser_build: 'build2'
+  torbrowser_version: '9.0.3'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.0.1
+    - 9.0.2
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1