[tor-commits] [tor-browser-bundle/maint-6.0] Release preparations for 6.0.2

[gk at torproject.org]

commit 4675811efa2cdc1d9d61a4420735d18ce1bdb417
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 17 15:10:50 2016 +0000

    Release preparations for 6.0.2
    
    Version bumps, Changelog update and config.yml update
---
 Bundle-Data/Docs/ChangeLog.txt    | 12 ++++++++++++
 gitian/versions                   |  4 ++--
 tools/update-responses/config.yml | 10 +++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 3fb411e..6325c23 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,15 @@
+Tor Browser 6.0.2 -- June 21
+ * All Platforms
+   * Update Torbutton to 1.9.5.5
+     * Bug 19417: Clear asmjscache
+   * Bug 19401: Fix broken PDF download button
+   * Bug 19411: Don't show update icon if a partial update failed
+   * Bug 19400: Back out GCC bug workaround to avoid asmjs crash
+ * Windows
+   * Bug 19348: Adapt to more than one build target on Windows (fixes updates)
+ * Linux
+   * Bug 19276: Disable Xrender due to possible performance regressions
+
 Tor Browser 6.0.1 -- June 7
  * All Platforms
    * Update Firefox to 45.2.0esr
diff --git a/gitian/versions b/gitian/versions
index 8bbfeb3..6dbc151 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -14,10 +14,10 @@ FIREFOX_VERSION=45.2.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2
 TOR_TAG=tor-0.2.7.6
 TORLAUNCHER_TAG=0.2.9.3
-TORBUTTON_TAG=1.9.5.4
+TORBUTTON_TAG=1.9.5.5
 HTTPSE_TAG=5.1.9
 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 e7ea1a7..4e89b8a 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -13,15 +13,15 @@ build_targets:
     osx64: Darwin_x86_64-gcc3
 channels:
     alpha: 6.0a5
-    release: 6.0.1
+    release: 6.0.2
 versions:
-    6.0.1:
+    6.0.2:
         platformVersion: 45.2.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-601-released
-        download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.1
+        detailsURL: https://blog.torproject.org/blog/tor-browser-602-released
+        download_url: https://cdn.torproject.org/aus1/torbrowser/6.0.2
         incremental_from:
-          - 5.5.5
           - 6.0
+          - 6.0.1
         migrate_archs:
           osx32: osx64
         osx32: