[tor-commits] [tor-browser-bundle/maint-4.0] Bumped HTTPS-E; updated changelog/versions.

[gk at torproject.org]

commit ee0f34c497292135a0cd05a7791444fc324d44f5
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Nov 28 10:33:31 2014 +0000

    Bumped HTTPS-E; updated changelog/versions.
---
 Bundle-Data/Docs/ChangeLog.txt |    4 +++-
 gitian/versions                |    8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 65c0493..50f7974 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -2,17 +2,19 @@ Tor Browser 4.0.2 -- Dec 2 2014
  * All Platforms
    * Update Firefox to 31.3.0esr
    * Update NoScript to 2.6.9.5
+   * Update HTTPS Everywhere to 4.0.2
    * Update Torbutton to 1.7.0.2
      * Bug 13019: Synchronize locale spoofing pref with our Firefox patch
      * Bug 13746: Properly link Torbutton UI to thirdparty pref.
    * Bug 13742: Fix domain isolation for content cache and disk-enabled browsing mode
    * Bug 5926: Prevent JS engine locale leaks (by setting the C library locale)
+   * Bug 13504: Remove unreliable/unreachable non-public bridges
+   * Bug 13435: Remove our custom POODLE fix
  * Windows
    * Bug 13443: Re-enable DirectShow; fix crash with mingw patch.
    * Bug 13558: Fix crash on Windows XP during download folder changing
    * Bug 13594: Fix update failure for Windows XP users
 
-
 Tor Browser 4.0.1 -- Oct 30 2014
  * All Platforms
    * Update Tor to 0.2.5.10
diff --git a/gitian/versions b/gitian/versions
index 31677e1..6f9d97b 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -1,4 +1,4 @@
-TORBROWSER_VERSION=4.0.1
+TORBROWSER_VERSION=4.0.2
 BUNDLE_LOCALES="ar de es-ES fa fr it ko nl pl pt-PT ru tr vi zh-CN"
 BUILD_PT_BUNDLES=1
 
@@ -8,7 +8,7 @@ FIREFOX_VERSION=31.3.0esr
 
 TORBROWSER_UPDATE_CHANNEL=release
 
-TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build1
+TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.0-1-build2
 TOR_TAG=tor-0.2.5.10
 TORLAUNCHER_TAG=0.2.7.0.1
 TORBUTTON_TAG=1.7.0.2
@@ -47,7 +47,7 @@ PY2EXE_VER=0.6.9
 SETUPTOOLS_VER=1.4
 LXML_VER=3.3.5
 PARSLEY_VER=1.2
-HTTPSE_VER=4.0.1
+HTTPSE_VER=4.0.2
 GO_VER=1.3.3
 
 ## File names for the source packages
@@ -82,7 +82,7 @@ OSXSDK_HASH=6602d8d5ddb371fbc02e2a5967d9bd0cd7358d46f9417753c8234b923f2ea6fc
 TOOLCHAIN4_HASH=7b71bfe02820409b994c5c33a7eab81a81c72550f5da85ff7af70da3da244645
 TOOLCHAIN4_OLD_HASH=65c1b2d302358a6b95a26c6828a66908a199276193bb0b268f2dcc1a997731e9
 NOSCRIPT_HASH=6db840d4ecf60985aa9eb7ef0142e67d78503d76a778f8f4e7e33e1810a2701a
-HTTPSE_HASH=cd811b1d424ff24939249de1e2b745ba86cbd7e6804699a9460c631a0b3474fe
+HTTPSE_HASH=c83f9bc10f3da6e33e2242c7944fd2bb534708821685bef7b9d16850550cc858
 MSVCR100_HASH=1221a09484964a6f38af5e34ee292b9afefccb3dc6e55435fd3aaf7c235d9067
 PYCRYPTO_HASH=f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 ARGPARSE_HASH=ddaf4b0a618335a32b6664d4ae038a1de8fbada3b25033f9021510ed2b3941a4