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

[gk at torproject.org]

commit 1d354578562692b31ec99a17f0022740495a5229
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Mar 16 08:42:30 2016 +0000

    Release preparations for 6.0a4
    
    Version bumps, update Changelog and config.yml
---
 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 4406c3d..3b3cfd8 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tor Browser 6.0a4 -- 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 f94ad7a..4c6f016 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -7,14 +7,14 @@ BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=38.7.0esr
+FIREFOX_VERSION=38.7.1esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
 TOR_TAG=tor-0.2.8.1-alpha
 TORLAUNCHER_TAG=0.2.9
-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 a28f18a..69e9a2c 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:
-    alpha: 6.0a3
+    alpha: 6.0a4
     release: 5.5
 versions:
     5.5:
@@ -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:
-        platformVersion: 38.7.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-60a3-released
-        download_url: https://www.torproject.org/dist/torbrowser/6.0a3
+    6.0a4:
+        platformVersion: 38.7.1
+        detailsURL: https://blog.torproject.org/blog/tor-browser-60a4-released
+        download_url: https://www.torproject.org/dist/torbrowser/6.0a4
         incremental_from:
           - 6.0a2
+          - 6.0a3
         migrate_archs:
           osx32: osx64
         osx32: