[tbb-commits] [tor-browser-bundle/maint-3.6] Fix changelog to say 3.6.4.

[mikeperry at torproject.org]

commit 23bccdb1ca1003a326b3815019aa88722d59e386
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Aug 4 19:24:20 2014 -0700

    Fix changelog to say 3.6.4.
    
    Also update Torbutton version to pick up some UI tweaks.
---
 Bundle-Data/Docs/ChangeLog.txt |    5 ++++-
 gitian/versions                |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 7ecd891..d2468be 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,8 +1,11 @@
-Tor Browser Bundle 3.6.3 -- Aug 6 2014
+Tor Browser Bundle 3.6.4 -- Aug 6 2014
  * All Platforms
    * Update Tor to 0.2.4.23
    * Update Tor launcher to 0.2.5.6
      * Bug 9516: Send Tor Launcher log messages to Browser Console
+   * Update Torbutton to 1.6.11.1
+     * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap
+     * Bug 12680: Fix Torbutton about url.
 
 Tor Browser Bundle 3.6.3 -- Jul 24 2014
  * All Platforms
diff --git a/gitian/versions b/gitian/versions
index 10690ce..e5e53e4 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -9,7 +9,7 @@ FIREFOX_VERSION=24.7.0esr
 TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1
 TOR_TAG=tor-0.2.4.23
 TORLAUNCHER_TAG=0.2.5.6
-TORBUTTON_TAG=1.6.11.0
+TORBUTTON_TAG=1.6.11.1
 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.1
 ZLIB_TAG=v1.2.8