[tor-commits] [tor-browser-bundle/master] Fold in stable changelog

[gk at torproject.org]

commit 10aa41a5d6abf25a912616c39d9e39ebb7cc29d6
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Aug 19 09:15:28 2016 +0200

    Fold in stable changelog
---
 Bundle-Data/Docs/ChangeLog.txt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Bundle-Data/Docs/ChangeLog.txt b/Bundle-Data/Docs/ChangeLog.txt
index c0abf86..4506e37 100644
--- a/Bundle-Data/Docs/ChangeLog.txt
+++ b/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,9 @@
+Tor Browser 6.0.4 -- August 16
+ * All Platforms
+   * Update Tor to 0.2.8.6
+   * Update NoScript to 2.9.0.14
+   * Bug 19890: Disable installation of system addons
+
 Tor Browser 6.5a2-hardened -- August 3
  * All Platforms
    * Update Firefox to 45.3.0esr