[tor-commits] [tor-browser-bundle/hardened-builds] Preparations for -build4

[gk at torproject.org]

commit 52d518cc8c89b2934190838fbe3075e686e05b97
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Apr 26 21:28:04 2016 +0000

    Preparations for -build4
---
 Bundle-Data/Docs/ChangeLog.txt | 6 +++++-
 gitian/versions.alpha          | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 49a49e5..35d0e9d 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,4 +1,4 @@
-Tor Browser 6.0a5-hardened -- April 27 2016
+Tor Browser 6.0a5-hardened -- April 28 2016
  * All Platforms
    * Update Firefox to 45.1.0esr
    * Update Tor to 0.2.8.2-alpha
@@ -14,6 +14,7 @@ Tor Browser 6.0a5-hardened -- April 27 2016
    * Update meek to 0.22 (tag 0.22-18371-2)
      * Bug 18371: Symlinks are incompatible with Gatekeeper signing
    * Bug 15197 and child tickets: Rebase Tor Browser patches to ESR 45
+   * Bug 18900: Fix broken updater on Linux
    * Bug 18042: Disable SHA1 certificate support
    * Bug 18821: Disable libmdns support for desktop and mobile
    * Bug 18848: Disable additional welcome URL shown on first start
@@ -33,6 +34,9 @@ Tor Browser 6.0a5-hardened -- April 27 2016
    * Bug 18741: Fix OCSP and favicon isolation for ESR 45
    * Bug 16998: Disable <link rel="preconnect"> for now
    * Bug 17506: Reenable building hardened Tor Browser with startup cache
+   * Bug 18898: Exempt the meek extension from the signing requirement as well
+   * Bug 18899: Don't copy Torbutton, TorLauncher, etc. into meek profile
+   * Bug 18890: Test importScripts() for cache and network isolation
    * Bug 18726: Add new default obfs4 bridge (GreenBelt)
  * Build System
    * Bug 16224: Don't use BUILD_HOSTNAME anymore in Firefox builds
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 2a8e10f..b9239dc 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -18,7 +18,7 @@ FIREFOX_VERSION=45.1.0esr
 
 TORBROWSER_UPDATE_CHANNEL=hardened
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build3
 TOR_TAG=tor-0.2.8.2-alpha
 TORLAUNCHER_TAG=0.2.8.4
 TORBUTTON_TAG=1.9.5.3