[tor-commits] [tor-browser-bundle/master] Update main Changelog with newer 3.6.4 material.

[mikeperry at torproject.org]

commit 4426a4daed68c08d4582b8b713b0dd3bdf397b82
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Aug 6 16:06:37 2014 -0700

    Update main Changelog with newer 3.6.4 material.
---
 Bundle-Data/Docs/ChangeLog.txt |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 9626ceb..8eb4284 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,4 +1,4 @@
-Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014
+Tor Browser Bundle 4.0-alpha-1 -- Aug 8 2014
  * All Platforms
    * Ticket 10935: Include the Meek Pluggable Transport (version 0.10)
      * Two modes of Meek are provided: Meek over Google and Meek over Amazon
@@ -31,10 +31,15 @@ Tor Browser Bundle 4.0-alpha-1 -- Aug 7 2014
    * Bug 11102: Set Window Class to "Tor Browser" to aid in Desktop navigation
    * Bug 12249: Don't create PT debug files anymore
 
-Tor Browser Bundle 3.6.4 -- Aug 6 2014
+Tor Browser Bundle 3.6.4 -- Aug 8 2014
  * All Platforms
    * Update Tor to 0.2.4.23
    * Update Tor launcher to 0.2.5.6
+   * Update OpenSSL to 1.0.1i
+   * Backported Tor Patches:
+     * Bug 11654: Properly apply the fix for malformed bug11156 log message
+     * Bug 11200: Fix a hang during bootstrap introduced in the initial
+                  bug11200 patch.
    * Update NoScript to 2.6.8.36
      * Bug 9516: Send Tor Launcher log messages to Browser Console
    * Update Torbutton to 1.6.11.1