commit 1d5a375834a1fc1884145591d4fb63623b071486 Author: Georg Koppen gk@torproject.org Date: Wed Jun 20 19:46:00 2018 +0000

Prepating build2 with fix for #26428 --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + rbm.conf | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index f7160bf..84f2c76 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,6 +5,7 @@ Tor Browser 7.5.6 -- June 26 2018 * Update Tor Launcher to 0.2.14.5 * Bug 20890: Increase control port connection timeout * Update HTTPS Everywhere to 2018.6.13 + * Bug 26428: Work around HTTPS Everywhere caused build bustage * Update NoScript to 5.1.8.6 * Bug 21537: Mark .onion cookies as secure * Bug 25938: Backport fix for cross-origin header leak (bug 1334776) diff --git a/rbm.conf b/rbm.conf index 5a90617..079c216 100644 --- a/rbm.conf +++ b/rbm.conf @@ -16,7 +16,7 @@ buildconf:

var: torbrowser_version: '7.5.6' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 7.5.4 - 7.5.5