[tbb-commits] [tor-browser-bundle/maint-3.6] Add Changelog fo 3.6.4.

[mikeperry at torproject.org]

commit a37f1c0cf686c2ad3cdbe715c6b242a0d2cfb9ac
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Aug 4 18:34:49 2014 -0700

    Add Changelog fo 3.6.4.
    
    Also bump Tor Launcher version to pick up #9516.
---
 Bundle-Data/Docs/ChangeLog.txt |    6 ++++++
 gitian/versions                |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 1e12190..7ecd891 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,9 @@
+Tor Browser Bundle 3.6.3 -- 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
+
 Tor Browser Bundle 3.6.3 -- Jul 24 2014
  * All Platforms
    * Update Firefox to 24.7.0esr
diff --git a/gitian/versions b/gitian/versions
index 38eae32..10690ce 100755
--- a/gitian/versions
+++ b/gitian/versions
@@ -1,4 +1,4 @@
-TORBROWSER_VERSION=3.6.4pre
+TORBROWSER_VERSION=3.6.4
 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=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.5
+TORLAUNCHER_TAG=0.2.5.6
 TORBUTTON_TAG=1.6.11.0
 HTTPSE_TAG=3.5.3 # XXX: HTTPSE_VER is used instead, pending #11630
 NSIS_TAG=v0.1