[tor-commits] [torbutton/maint-1.9.5] Release preparations for 1.9.5.6

[gk at torproject.org]

commit 7b983fe74fca4bc29d68e0a4ed3c2eeae2ba1113
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jul 22 14:33:41 2016 +0000

    Release preparations for 1.9.5.6
---
 src/CHANGELOG   | 4 ++++
 src/install.rdf | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 77ba290..28cff54 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,7 @@
+1.9.5.6
+ * Bug 19417: Disable asmjs for now
+ * Bug 19689: Use proper parent windows for plugin prompt
+
 1.9.5.5
  * Bug 19417: Clear asmjscache
 
diff --git a/src/install.rdf b/src/install.rdf
index ac45b1d..9098991 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
         <em:name>Torbutton</em:name>
         <em:creator>Mike Perry</em:creator>
         <em:id>torbutton at torproject.org</em:id>
-        <em:version>1.9.5.5</em:version>
+        <em:version>1.9.5.6</em:version>
         <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>