[tbb-commits] [tor-browser-bundle/master] Bump Tor version and update changelog for 4.0-alpha-1.

[mikeperry at torproject.org]

commit ee84742da7aff980dca12fb410455a3a38f08bb2
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Jul 28 14:04:20 2014 -0700

    Bump Tor version and update changelog for 4.0-alpha-1.
---
 Bundle-Data/Docs/ChangeLog.txt |    2 +-
 gitian/versions.alpha          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index ef2dd84..54875ad 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -2,7 +2,7 @@ Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014
  * All Platforms
    * Include the Meek Pluggable Transport (version 0.9) (Bug 10935)
    * Update Firefox to 24.7.0esr
-   * Update Tor to 0.2.5.5-alpha
+   * Update Tor to 0.2.5.6-alpha
    * Update NoScript to 2.6.8.33
      * Script permissions now apply based on URL bar
    * Update HTTPS Everywhere to 3.5.3
diff --git a/gitian/versions.alpha b/gitian/versions.alpha
index 15a5d8b..69363a3 100755
--- a/gitian/versions.alpha
+++ b/gitian/versions.alpha
@@ -7,7 +7,7 @@ VERIFY_TAGS=1
 FIREFOX_VERSION=24.7.0esr
 
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-4.x-1-build1
-TOR_TAG=tor-0.2.5.5-alpha
+TOR_TAG=tor-0.2.5.6-alpha
 TORLAUNCHER_TAG=0.2.6.1
 TORBUTTON_TAG=1.6.11.1
 HTTPSE_TAG=3.5.3  # XXX: HTTPSE_VER is used instead, pending #11630