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

[gk at torproject.org]

commit c8b7419a32d6e9b7fed38fea60ce51f02f56a496
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Aug 12 07:44:11 2016 +0000

    Release preparations for 6.0.4
    
    Versions, changelog and config.yml update
---
 Bundle-Data/Docs/ChangeLog.txt    | 6 ++++++
 gitian/versions                   | 8 ++++----
 tools/update-responses/config.yml | 7 ++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index c4a255d..2bdf3e2 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,9 @@
+Tor Browser 6.0.4 -- August 16
+ * All Platforms
+   * Update Tor to 0.2.8.6
+   * Update NoScript to 2.9.0.14
+   * Bug 19890: Disable installation of system addons
+
 Tor Browser 6.0.3 -- August 2
  * All Platforms
    * Update Firefox to 45.3.0esr
diff --git a/gitian/versions b/gitian/versions
index f6d8648..67c114c 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -14,8 +14,8 @@ FIREFOX_VERSION=45.3.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build1
-TOR_TAG=tor-0.2.7.6
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-6.0-1-build2
+TOR_TAG=tor-0.2.8.6
 TORLAUNCHER_TAG=0.2.9.3
 TORBUTTON_TAG=1.9.5.6
 HTTPSE_TAG=5.2.1
@@ -66,7 +66,7 @@ NSIS_VER=2.51
 ## 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.12-fx+fn+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-2.9.0.14-fx+fn+sm.xpi
 TOOLCHAIN4_OLD_PACKAGE=multiarch-darwin11-cctools127.2-gcc42-5666.3-llvmgcc42-2336.1-Linux-120724.tar.xz
 CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
@@ -99,7 +99,7 @@ GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
 OSXSDK_OLD_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
-NOSCRIPT_HASH=3fa641dcb60455c950cef0c15effa8ca060b3b05405f46f55cbdb922929027e7
+NOSCRIPT_HASH=39bc71be20c318578239ea791c0341dbfcd13b33559af080cea386eeec08b337
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index ff17d28..f20e9b1 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -16,13 +16,14 @@ build_targets:
     osx64: Darwin_x86_64-gcc3
 channels:
     alpha: 6.5a2
-    release: 6.0.3
+    release: 6.0.4
 versions:
-    6.0.3:
+    6.0.4:
         platformVersion: 45.3.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-603-released
+        detailsURL: https://blog.torproject.org/blog/tor-browser-604-released
         incremental_from:
           - 6.0.2
+          - 6.0.3
         migrate_archs:
           osx32: osx64
         osx32: