From eaf882ad3dd1c5fc2461d5ba898837de1eed66eb Mon Sep 17 00:00:00 2001
From: Georg Koppen <gk@torproject.org>
Date: Thu, 20 Sep 2018 08:24:35 +0000
Subject: [PATCH] Preparing a build2 for 8.0.1
We pick up three patches that are planned for Firefox 60.2.1esr but we
can't wait for the final release candidate as we run out of time before
Mexico.
Furthermore, back out the moat related fix in Tor Launcher. We want to
give it a bit more testing time on alpha.
---
projects/firefox/config | 2 +-
projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++--
rbm.conf | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/projects/firefox/config b/projects/firefox/config
index ad9d7d8f3..9d675eb70 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
# 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") %]-1-build4'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build5'
tag_gpg_id: 1
git_url: https://git.torproject.org/tor-browser.git
gpg_keyring: torbutton.gpg
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 4cc90f3dd..12ae6ff0a 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -11,9 +11,8 @@ Tor Browser 8.0.1 -- September 20 2018
* Bug 27427: Fix NoScript IPC for about:blank by whitelisting messages
* Bug 27558: Update the link to "Your Guard note may not change" text
* Translations update
- * Update Tor Launcher to 0.2.16.5
+ * Update Tor Launcher to 0.2.16.6
* Bug 27469: Adapt Moat URLs
- * Bug 25405: Cannot use Moat if a meek bridge is configured
* Translations update
* Clean-up
* Update NoScript to 10.1.9.6
@@ -22,6 +21,7 @@ Tor Browser 8.0.1 -- September 20 2018
* Bug 27543: QR code is broken on web.whatsapp.com
* Bug 27264: Bookmark items are not visible on the boomark toolbar
* Bug 27535: Enable TLS 1.3 draft version
+ * Backport of Mozilla bug 1490585, 1475775, and 1489744
* OS X
* Bug 27482: Fix crash during start-up on macOS 10.9.x systems
* Linux
diff --git a/rbm.conf b/rbm.conf
index 8ad5c3470..529cd5689 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
var:
torbrowser_version: '8.0.1'
- torbrowser_build: 'build1'
+ torbrowser_build: 'build2'
torbrowser_incremental_from:
- 8.0
project_name: tor-browser
--
GitLab