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

[gk at torproject.org]

commit 29a782e2500b5313be28106c9a1cb5062bac5b41
Author: Georg Koppen <gk at torproject.org>
Date:   Sat Jun 4 08:33:08 2016 +0000

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

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 6ab0827..e62bafd 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,23 @@
+1.9.6
+ * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu
+ * Bug 18905: Hide unusable items from help menu
+ * Bug 17599: Provide shortcuts for New Identity and New Circuit
+ * Bug 18980: Remove obsolete toolbar button code
+ * Bug 18238: Remove unused Torbutton code and strings
+ * Translation updates
+ * Code clean-up
+
+1.9.5.4
+ * Bug 18466: Make Torbutton compatible with Firefox ESR 45
+ * Bug 18743: Pref to hide 'Sign in to Sync' button in hamburger menu
+ * Bug 18905: Hide unusable items from help menu
+ * Bug 16017: Allow users to more easily set a non-tor SSH proxy
+ * Bug 17599: Provide shortcuts for New Identity and New Circuit
+ * Bug 18980: Remove obsolete toolbar button code
+ * Bug 14429: Make sure the automatic resizing is disabled
+ * Translation updates
+ * Code clean-up
+
 1.9.5.3
  * Bug 18466: Make Torbutton compatible with Firefox ESR 45
  * Translation updates
diff --git a/src/install.rdf b/src/install.rdf
index 58f51b3..db269d5 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.3</em:version>
+        <em:version>1.9.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>