[tbb-commits] [tor-browser-build/master] Pick up new tor-browser tag and use build5 for 8.0

[gk at torproject.org]

commit 346bf3bd582ea9a16f99358e892f204df4295515
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Sep 2 17:09:11 2018 +0000

    Pick up new tor-browser tag and use build5 for 8.0
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 +
 rbm.conf                                            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 1a94f2d..124de7a 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 477845b..c46f139 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -108,6 +108,7 @@ Tor Browser 8.0 -- September 5 2018
      * Bug 26874: Fix UNC path restrictions failure in Tor Browser 8.0a9
      * Bug 12968: Enable HEASLR in Windows x86_64 builds
    * Bug 26381: Work around endless loop during page load and about:tor not loading
+   * Bug 27411: Fix broken security slider and NoScript interaction on Windows
    * Bug 22581: Fix shutdown crash
    * Bug 25266: PT config should include full names of executable files
    * Bug 26304: Update zlib to version 1.2.11
diff --git a/rbm.conf b/rbm.conf
index d99460d..5cc88e4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0'
-  torbrowser_build: 'build4'
+  torbrowser_build: 'build5'
   torbrowser_incremental_from:
     - 7.5.6
   project_name: tor-browser