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

[mikeperry at torproject.org]

commit 176e3bc6e451bb6f515ef657977c2eaa64f19bb3
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Aug 4 19:50:28 2014 -0700

    Update changelog for meek.
---
 Bundle-Data/Docs/ChangeLog.txt |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index bd80adb..7b92997 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,7 @@
 Tor Browser Bundle 4.0-alpha-1 -- Jul 29 2014
  * All Platforms
-   * Include the Meek Pluggable Transport (version 0.9) (Bug 10935)
+   * Ticket 10935: Include the Meek Pluggable Transport (version 0.10)
+     * Two modes of Meek are provided: Meek over Google and Meek over Amazon
    * Update Firefox to 24.7.0esr
    * Update Tor to 0.2.5.6-alpha
    * Update NoScript to 2.6.8.33