[tbb-commits] [tor-browser-bundle/hardened-builds] Release preparations for 6.0a4-hardened

[gk at torproject.org]

commit 8faaef67a16356295d967879c071e7f196c6c91c
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Mar 17 08:43:39 2016 +0000

    Release preparations for 6.0a4-hardened
    
    Changelog update, versions bump and config.yml update
---
 Bundle-Data/Docs/ChangeLog.txt    |  7 +++++++
 gitian/versions.alpha             |  4 ++--
 tools/update-responses/config.yml | 11 ++++++-----
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 2278042..f348f23 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tor Browser 6.0a4-hardened -- March 17 2016
+ * All Platforms
+   * Update Firefox to 38.7.1esr
+   * Update Torbutton to 1.9.5.2
+     * Bug 18557: Exempt Graphite from the Security Slider
+   * Bug 18536: Make Mosaddegh and MaBishomarim available on port 80 and 443
+
 Tor Browser 6.0a3-hardened -- March 8
  * All Platforms
    * Update Firefox to 38.7.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index b46c736..71058ca 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -11,14 +11,14 @@ MULTI_LINGUAL=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=38.7.0esr
+FIREFOX_VERSION=38.7.1esr
 
 TORBROWSER_UPDATE_CHANNEL=hardened
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
 TOR_TAG=tor-0.2.8.1-alpha
 TORLAUNCHER_TAG=0.2.8.3
-TORBUTTON_TAG=1.9.5.1
+TORBUTTON_TAG=1.9.5.2
 HTTPSE_TAG=5.1.4
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 2c9e0a8..ceaaf10 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -9,7 +9,7 @@ build_targets:
     osx32: Darwin_x86-gcc3
     osx64: Darwin_x86_64-gcc3
 channels:
-    hardened: 6.0a3-hardened
+    hardened: 6.0a4-hardened
     release: 5.0
 versions:
     5.0:
@@ -23,12 +23,13 @@ versions:
         osx32:
             minSupportedOSVersion: 10.8
             detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating
-    6.0a3-hardened:
-        platformVersion: 38.7.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-60a3-hardened-released
-        download_url: https://www.torproject.org/dist/torbrowser/6.0a3-hardened
+    6.0a4-hardened:
+        platformVersion: 38.7.1
+        detailsURL: https://blog.torproject.org/blog/tor-browser-60a4-hardened-released
+        download_url: https://www.torproject.org/dist/torbrowser/6.0a4-hardened
         incremental_from:
           - 6.0a2-hardened
+          - 6.0a3-hardened
         migrate_archs:
           osx32: osx64
         osx32: