[tor-commits] [tor-browser-build/master] Pick up three Mozilla patches for 8.5a2

[gk at torproject.org]

commit 578b05727c639523148353d88bbec620b8bca64b
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Sep 20 09:15:13 2018 +0000

    Pick up three Mozilla patches for 8.5a2
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 ++-
 rbm.conf                                            | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index aca6ce9..89e5ce6 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-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
 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 0276ef5..aec6bc4 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,4 +1,4 @@
-Tor Browser 8.5a2 -- September 20 2018
+Tor Browser 8.5a2 -- September 24 2018
  * All platforms
    * Update Tor to 0.3.5.1-alpha
    * Update Torbutton to 2.1
@@ -24,6 +24,7 @@ Tor Browser 8.5a2 -- September 20 2018
    * Bug 27264: Bookmark items are not visible on the boomark toolbar
    * Bug 27535: Enable TLS 1.3 draft version
    * Bug 27623: Use MOZILLA_OFFICIAL for our builds
+   * Backport of Mozilla bug 1490585, 1475775, and 1489744
  * Windows:
    * Bug 26381: about:tor page does not load on first start on Windows
  * Linux:
diff --git a/rbm.conf b/rbm.conf
index 461849c..65ffefa 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.5a2'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 8.5a1
   project_name: tor-browser