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

[gk at torproject.org]

commit fdb68b2ddbe0ba9c4f0a316e850488def5f24c85
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jan 22 14:05:32 2016 +0000

    Release preparations
    
    Changelog update, version bumps, config.yml update
---
 Bundle-Data/Docs/ChangeLog.txt    |   24 ++++++++++++++++++++++++
 gitian/versions.alpha             |   16 ++++++++--------
 tools/update-responses/config.yml |   12 ++++++------
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 6042c2f..6000e97 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,27 @@
+Tor Browser 6.0a1 -- January 27 2016
+ * All Platforms
+   * Update Firefox to 38.6.0esr
+   * Update NoScript to 2.9.0.2
+   * Update Torbutton to 1.9.5
+     * Bug 16990: Show circuit display for connections using multi-party channels
+     * Bug 18019: Avoid empty prompt shown after non-en-US update
+     * Bug 18004: Remove Tor fundraising donation banner
+     * Code cleanup
+     * Translation updates
+   * Update Tor Launcher to 0.2.9
+     * Bug 18113: Randomly permutate available default bridges of chosen type
+     * Bug 11773: Setup wizard UI flow improvements
+     * Translation updates
+   * Bug 17428: Remove Flashproxy
+   * Bug 18115+18102+18071+18091: Update/add new obfs4 bridge
+   * Bug 18072: Change recommended pluggable transport type to obfs4
+   * Bug 18008: Create a new MAR Signing key and bake it into Tor Browser
+   * Bug 16322: Use onion address for DuckDuckGo search engine
+   * Bug 17917: Changelog after update is empty if JS is disabled
+ * Build System
+   * Linux
+     * Bug 15578: Switch to Debian Wheezy guest VMs (10.04 LTS is EOL)
+
 Tor Browser 5.5 -- January 26 2016
  * All Platforms
    * Update Firefox to 38.6.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 5b7ef02..d234e33 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -7,14 +7,14 @@ BUILD_PT_BUNDLES=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=38.5.0esr
+FIREFOX_VERSION=38.6.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
 TOR_TAG=tor-0.2.7.6
-TORLAUNCHER_TAG=0.2.7.7
-TORBUTTON_TAG=1.9.4.2
+TORLAUNCHER_TAG=0.2.9
+TORBUTTON_TAG=1.9.5
 HTTPSE_TAG=5.1.2
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
@@ -36,12 +36,12 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
 OBFS4_TAG=obfs4proxy-0.0.5
 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
-GITIAN_TAG=tor-browser-builder-3.x-8-gpgsux
+GITIAN_TAG=tor-browser-builder-3.x-9
 
 OPENSSL_VER=1.0.1q
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build2
+FIREFOX_LANG_BUILD=build1
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
 PYTHON_VER=2.7.5
@@ -59,7 +59,7 @@ NOTOCJKFONT_VER=1.004
 ## 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-sm+fx+fn.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.2-sm+fx+fn.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
@@ -87,7 +87,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71
+NOSCRIPT_HASH=f3c9dec710e02d809fa85ac76750e5f074656105c1bde03d400cb597b2eb1fba
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 362c146..a0f5309 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: 5.5a6
+    alpha: 6.0a1
     release: 5.5
 versions:
     5.5:
@@ -23,12 +23,12 @@ versions:
         osx32:
             minSupportedOSVersion: 10.8
             detailsURL: https://blog.torproject.org/blog/end-life-plan-tor-browser-32-bit-macs#updating
-    5.5a6:
-        platformVersion: 38.5.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-55a6-released
-        download_url: https://www.torproject.org/dist/torbrowser/5.5a6
+    6.0a1:
+        platformVersion: 38.6.0
+        detailsURL: https://blog.torproject.org/blog/tor-browser-60a1-released
+        download_url: https://www.torproject.org/dist/torbrowser/6.0a1
         incremental_from:
-          - 5.5a5
+          - 5.5a6
         migrate_archs:
           osx32: osx64
         osx32: