[tor-commits] [tor-browser-bundle/master] Revert "Remove Torbutton 1.6.12.3 from 3.6.6 changelog."

[mikeperry at torproject.org]

commit 526c77292bcd2f06a5f5cb17e80b58b549a14b2a
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Wed Sep 24 01:01:25 2014 -0700

    Revert "Remove Torbutton 1.6.12.3 from 3.6.6 changelog."
    
    This reverts commit 12f43a2f34f5341b66ae259bf26c78d7a8d89544.
    
    Ah, screw it. Let's keep it! What could possibly go wrong!
---
 Bundle-Data/Docs/ChangeLog.txt |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index 539a038..6f3ea04 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -22,6 +22,9 @@ Tor Browser Bundle 3.6.6 -- Sep 24 2014
    * Update NoScript to 2.6.8.42
    * Update HTTPS Everywhere to 4.0.1
    * Bug 12998: Prevent intermediate certs from being written to disk
+   * Update Torbutton to 1.6.12.3
+     * Bug 13091: Use "Tor Browser" everywhere
+     * Bug 10804: Workaround fix for some cases of startup hang
  * Linux
    * Bug 9150: Make RPATH unavailable on Tor binary.
    * Bug 13031: Add full RELRO protection.