[tor-commits] [tor-browser-bundle/master] Preparations for 5.5a6

[gk at torproject.org]

commit 4ecd949538a9dee8ce070a7d69800eb9ab229860
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jan 5 21:07:51 2016 +0000

    Preparations for 5.5a6
---
 Bundle-Data/Docs/ChangeLog.txt    |    7 +++++++
 gitian/versions.alpha             |    8 ++++----
 tools/update-responses/config.yml |   10 +++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 4812fc4..87a3799 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,10 @@
+Tor Browser 5.5a6 -- January 7 2016
+ * All Platforms
+   * Update NoScript to 2.9
+   * Update HTTPS Everywhere to 5.1.2
+   * Bug 17931: Tor Browser crashes in LogMessageToConsole()
+   * Bug 17875: Discourage editing of torrc-defaults
+
 Tor Browser 5.5a5 -- December 15 2015
  * All Platforms
    * Update Firefox to 38.5.0esr
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index d1c9f36..149b765 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -11,11 +11,11 @@ FIREFOX_VERSION=38.5.0esr
 
 TORBROWSER_UPDATE_CHANNEL=alpha
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-5.5-2-build2
 TOR_TAG=tor-0.2.7.6
 TORLAUNCHER_TAG=0.2.7.7
 TORBUTTON_TAG=1.9.4.2
-HTTPSE_TAG=5.1.1
+HTTPSE_TAG=5.1.2
 NSIS_TAG=v0.3
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
@@ -62,7 +62,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.7-sm+fx+fn.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9-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
@@ -93,7 +93,7 @@ OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=ab84fd85addd6c15f2ce1e81c58ac9f09b228f9e56703f4d938447b8a2b752ea
+NOSCRIPT_HASH=7d67363b10708ef816d786e99d035a16a41eee8c8c1b3c87e4544717b066db71
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index ddd5b1e..d61793c 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.5a5
+    alpha: 5.5a6
     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
-    5.5a5:
+    5.5a6:
         platformVersion: 38.5.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-55a5-released
-        download_url: https://www.torproject.org/dist/torbrowser/5.5a5
+        detailsURL: https://blog.torproject.org/blog/tor-browser-55a6-released
+        download_url: https://www.torproject.org/dist/torbrowser/5.5a6
         incremental_from:
-          - 5.5a4
+          - 5.5a5
         migrate_archs:
           osx32: osx64
         osx32: