[tor-commits] [tor-browser-bundle/maint-7.0] Release preparations for 7.0.4

[gk at torproject.org]

commit cd573d8a0c7a45594d19f8461124d7d7fa5e50d1
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Aug 3 09:45:14 2017 +0000

    Release preparations for 7.0.4
    
    Changelog update, version bumps, and config.yml update
---
 Bundle-Data/Docs/ChangeLog.txt    | 28 ++++++++++++++++++++++++++++
 gitian/versions                   | 18 +++++++++---------
 tools/update-responses/config.yml |  9 +++++----
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index d509505..8fa01c9 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,34 @@
+Tor Browser 7.0.4 -- August 8 2017
+ * All Platforms
+   * Update Firefox to 52.3.0esr
+   * Update Tor to 0.3.0.10
+   * Update Torbutton to 1.9.7.5
+     * Bug 21999: Fix display of language prompt in non-en-US locales
+     * Bug 18193: Don't let about:tor have chrome privileges
+     * Bug 22535: Search on about:tor discards search query
+     * Bug 21948: Going back to about:tor page gives "Address isn't valid" error
+     * Code clean-up
+     * Translations update
+   * Update Tor Launcher to 0.2.12.3
+     * Bug 22592: Default bridge settings are not removed
+     * Translations update
+   * Update HTTPS-Everywhere to 5.2.21
+   * Update NoScript to 5.0.8.1
+     * Bug 22362: Remove workaround for XSS related browser freezing
+     * Bug 22067: NoScript Click-to-Play bypass with embedded videos and audio
+   * Bug 21321: Exempt .onions from HTTP related security warnings
+   * Bug 22073: Disable GetAddons option on addons page
+   * Bug 22884: Fix broken about:tor page on higher security levels
+ * Windows
+   * Bug 22829: Remove default obfs4 bridge riemann.
+   * Bug 21617: Fix single RWX page on Windows (included in 52.3.0esr)
+ * OS X
+   * Bug 22829: Remove default obfs4 bridge riemann.
+
 Tor Browser 7.0.3 -- July 27 2017
  * Linux
    * Bug 23044: Don't allow GIO supported protocols by default
+   * Bug 22829: Remove default obfs4 bridge riemann.
 
 Tor Browser 7.0.2 -- July 3 2017
  * All Platforms
diff --git a/gitian/versions b/gitian/versions
index 873aa7f..0c9d620 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -10,15 +10,15 @@ DATA_OUTSIDE_APP_DIR=1
 
 VERIFY_TAGS=1
 
-FIREFOX_VERSION=52.2.0esr
+FIREFOX_VERSION=52.3.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-7.0-1-build1
-TOR_TAG=tor-0.3.0.9
-TORLAUNCHER_TAG=0.2.12.2
-TORBUTTON_TAG=1.9.7.4
-HTTPSE_TAG=5.2.19
+TOR_TAG=tor-0.3.0.10
+TORLAUNCHER_TAG=0.2.12.3
+TORBUTTON_TAG=1.9.7.5
+HTTPSE_TAG=5.2.21
 NSIS_TAG=v0.3.1
 ZLIB_TAG=v1.2.8
 LIBEVENT_TAG=release-2.0.22-stable
@@ -40,12 +40,12 @@ GO_X_NET_TAG=7dbad50ab5b31073856416cdcfeb2796d682f844
 OBFS4_TAG=obfs4proxy-0.0.5
 NOTOFONTS_TAG=720e34851382ee3c1ef024d8dffb68ffbfb234c2
 
-GITIAN_TAG=tor-browser-builder-4-4
+GITIAN_TAG=tor-browser-builder-4-5
 
 OPENSSL_VER=1.0.2k
 GMP_VER=5.1.3
 FIREFOX_LANG_VER=$FIREFOX_VERSION
-FIREFOX_LANG_BUILD=build1
+FIREFOX_LANG_BUILD=build2
 BINUTILS_VER=2.24
 GCC_VER=5.1.0
 CLANG_VER=3.8.0
@@ -67,7 +67,7 @@ YASM_VER=1.2.0
 ## 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-5.0.7.1-fx+sm.xpi
+NOSCRIPT_PACKAGE=noscript_security_suite-5.0.8.1-fx+sm.xpi
 CCTOOLS_PACKAGE=cctools.tar.gz
 OSXSDK_PACKAGE=MacOSX10.7.sdk.tar.gz
 MSVCR100_PACKAGE=msvcr100.dll
@@ -102,7 +102,7 @@ YASM_PACKAGE=yasm-${YASM_VER}.tar.gz
 OPENSSL_HASH=6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0
 GMP_HASH=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160
 OSXSDK_HASH=da77bb0003fcca5ea8c4e8cb2da8828ded750c54afdcac29ec6f3b46ad5e3adf
-NOSCRIPT_HASH=fe85a4c72b5a763462f3b264f54a0ef1c6f6879eb95d903f2dfee337f768a50b
+NOSCRIPT_HASH=ef648454965242a57583d2541290bcf9526747b18335aeccdd55f39a23873bc3
 CCTOOLS_HASH=e908fdebc2886ee5491ebfc7e7950af451b3c4e2439c2d7a923ed06ad05113e4
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml
index 1547dfd..79c015d 100644
--- a/tools/update-responses/config.yml
+++ b/tools/update-responses/config.yml
@@ -20,13 +20,14 @@ build_targets:
     osx64: Darwin_x86_64-gcc3
 channels:
     alpha: 7.0a4
-    release: 7.0.3
+    release: 7.0.4
 versions:
-    7.0.3:
-        platformVersion: 52.2.0
-        detailsURL: https://blog.torproject.org/blog/tor-browser-703-released
+    7.0.4:
+        platformVersion: 52.3.0
+        detailsURL: https://blog.torproject.org/blog/tor-browser-704-released
         incremental_from:
           - 7.0.2
+          - 7.0.3
         migrate_archs:
           osx32: osx64
         migrate_langs: