[tbb-commits] [torbutton/master] Release preparations for 1.9.6.1

[mikeperry at torproject.org]

commit e403cd883db74649eed86aed0edaf3d101d07fbb
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Thu Jul 28 17:03:03 2016 -0700

    Release preparations for 1.9.6.1
    
    CHANGELOG update, version bump
---
 src/CHANGELOG   | 7 +++++++
 src/install.rdf | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index e62bafd..cd5ce27 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,10 @@
+1.9.6.1
+ * Bug 19206: Avoid SOCKS auth and NEWNYM collisions when sharing a tor client
+ * Bug 19417: Disable asm.js (but add code to clear on New Identity if enabled)
+ * Bug 19689: Plugin usage prompt is parented to wrong window
+ * Bug 19273: Improve external app launch handling and associated warnings
+ * Bug 8725: Block addon resource and url fingerprinting with nsIContentPolicy
+
 1.9.6
  * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu
  * Bug 18905: Hide unusable items from help menu
diff --git a/src/install.rdf b/src/install.rdf
index db269d5..e33fdb9 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.6</em:version>
+        <em:version>1.9.6.1</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>