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

[gk at torproject.org]

commit 7bc69717608f8be105594efa95d7bf7ccdc80077
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Feb 12 06:56:49 2016 +0000

    Release preparations for 6.0a2-hardened
---
 Bundle-Data/Docs/ChangeLog.txt    | 16 ++++++++++++++++
 gitian/versions.alpha             |  6 +++---
 tools/update-responses/config.yml | 12 ++++++------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 4210100..d2b7420 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,19 @@
+Tor Browser 6.0a2-hardened -- February 15 2016
+ * All Platforms
+   * Update Firefox to 38.6.1esr
+   * Update NoScript to 2.9.0.3
+   * Bug 18168: Don't clear an iframe's window.name (fix of #16620)
+   * Bug 18137: Add two new obfs4 default bridges
+ * Windows
+   * Bug 18169: Whitelist zh-CN UI font
+ * OSX
+   * Bug 18172: Add Emoji support
+ * Linux
+   * Bug 18172: Add Emoji support
+ * Build System
+   * Linux
+     * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL)
+
 Tor Browser 6.0a1-hardened -- January 27 2016
  * All Platforms
    * Update Firefox to 38.6.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 2921df9..42468c3 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -11,7 +11,7 @@ MULTI_LINGUAL=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=38.6.0esr
+FIREFOX_VERSION=38.6.1esr
 
 TORBROWSER_UPDATE_CHANNEL=hardened
 
@@ -62,7 +62,7 @@ GO_VER=1.4.2
 ## File names for the source packages
 OPENSSL_PACKAGE=openssl-${OPENSSL_VER}.tar.gz
 GMP_PACKAGE=gmp-${GMP_VER}.tar.bz2
-NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.3-fx+fn+sm.xpi
 TOOLCHAIN4_PACKAGE=x86_64-apple-darwin10.tar.xz
 TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -91,7 +91,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba
+NOSCRIPT_HASH=097298d5004c1f384f3af508cb1915921145f0f962e78c977a62f405bd7eb2d9
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index c66cec5..7b59296 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.0a1-hardened
+    hardened: 6.0a2-hardened
     release: 5.0
 versions:
     5.0:
@@ -23,12 +23,12 @@ versions:
         osx32:
             minSupportedOSVersion: 10.8
             detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating
-    6.0a1-hardened:
-        platformVersion: 38.6.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-60a1-hardened-released
-        download_url: https://www.torproject.org/dist/torbrowser/6.0a1-hardened
+    6.0a2-hardened:
+        platformVersion: 38.6.1
+        detailsURL: https://blog.torproject.org/blog/tor-browser-60a2-hardened-released
+        download_url: https://www.torproject.org/dist/torbrowser/6.0a2-hardened
         incremental_from:
-          - 5.5a6-hardened
+          - 6.0a1-hardened
         migrate_archs:
           osx32: osx64
         osx32: