[tbb-commits] [tor-browser-bundle/master] Update changelog for 3.6.1.

[mikeperry at torproject.org]

commit c6de6b29322dd1e928f181f18046cbf3d0ed921e
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Sat May 3 10:04:42 2014 -0700

    Update changelog for 3.6.1.
---
 Bundle-Data/Docs/ChangeLog.txt |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index e7d5178..2ce07b1 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,12 @@
+Tor Browser Bundle 3.6.1 -- May 6 2014
+ * All Platforms
+   * Update HTTPS-Everywhere to 3.5.1
+   * Bug 11658: Fix proxy configuration for non-Pluggable Transports users
+   * Backport Pending Tor Patches:
+     * Bug 8402: Allow Tor proxy configuration while PTs are present
+   * Note: The Pluggable Transports themselves have not been updated to
+           support proxy configuration yet.
+
 Tor Browser Bundle 3.6 -- Apr 29 2014
  * All Platforms
    * Update Firefox to 24.5.0esr