commit a55a359bc8e6dad3ae4bb73b1f2f683f61e96da6 Author: Mike Perry mikeperry-git@torproject.org Date: Thu Feb 19 12:57:40 2015 -0800

Add 4.0.4 changelog to master copy. --- Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++ 1 file changed, 10 insertions(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt index 210ac54..5137372 100644 --- a/Bundle-Data/Docs/ChangeLog.txt +++ b/Bundle-Data/Docs/ChangeLog.txt @@ -45,6 +45,16 @@ Tor Browser 4.5a4 -- Feb 24 2015 * Linux: * Bug 13717: Make sure we use the bash shell on Linux

+Tor Browser 4.0.4 -- Feb 24 2015 + * All Platforms + * Update Firefox to 31.5.0esr + * Update OpenSSL to 1.0.1l + * Update NoScript to 2.6.9.14 + * Update HTTPS-Everywhere to 4.0.3 + * Bug 14203: Prevent meek from displaying an extra update notification + * Bug 14849: Remove new NoScript menu option to make permissions permanent + * Bug 14851: Set NoScript pref to disable permanent permissions + Tor Browser 4.5a3 -- Jan 19 2015 * All Platforms * Update Firefox to 31.4.0esr