From 7e115d85dbf25e55efd95c271d29e407e42b4246 Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Thu, 18 Oct 2018 07:51:43 +0000
Subject: [PATCH] Release preparations for 8.0.3

Version bumps and Changelog update
---
 projects/firefox/config                            |  2 +-
 projects/https-everywhere/config                   |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 14 ++++++++++++++
 projects/tor-browser/config                        |  4 ++--
 projects/torbutton/config                          |  2 +-
 rbm.conf                                           |  4 ++--
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index debff3254..bad1ac5af 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -7,7 +7,7 @@ git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 60.2.1
+  firefox_platform_version: 60.3.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 8.0
   torbrowser_update_channel: alpha
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 03edcee39..e189eb950 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2018.8.22
+version: 2018.9.19
 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 ec0bf46b1..b98edcb1c 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,17 @@
+Tor Browser 8.0.3 -- October 23 2018
+ * All platforms
+   * Update Firefox to 60.3.0esr
+   * Update Torbutton to 2.0.8
+     * Bug 23925+27959: Donation banner for year end 2018 campaign
+     * Bug 24172: Donation banner clobbers Tor Browser version string
+     * Bug 27760: Use new NoScript API for IPC and fix about:blank issue
+     * Translations update
+   * Update HTTPS Everywhere to 2018.9.19
+   * Update NoScript to 10.1.9.9
+ * Linux
+   * Bug 27546: Fix vertical scrollbar behavior in Tor Browser 8 with Gtk3
+   * Bug 27552: Use bundled dir on CentOS/RHEL 6
+
 Tor Browser 8.0.2 -- October 2 2018
  * All platforms
    * Update Firefox to 60.2.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 1647b7706..50d67e082 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -67,9 +67,9 @@ input_files:
     name: snowflake
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.1.9.6-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-10.1.9.9-an+fx.xpi
     name: noscript
-    sha256sum: 336ae26d0a70688e6c2b3c14267c9e80f52f6f36c31f23b8242e0edae3666d42
+    sha256sum: e7ec0345c2174e64c7552ab708a59c8efd7c1078fedda64d9c9ad06a899194b9
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/torbutton/config b/projects/torbutton/config
index 2b2df85f4..df0d674c8 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.0.7
+version: 2.0.8
 git_url: https://git.torproject.org/torbutton.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index fbc977687..b4f58ede3 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '8.0.2'
+  torbrowser_version: '8.0.3'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 8.0.1
+    - 8.0.2
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1
-- 
GitLab