[tbb-commits] [torbutton/maint-1.9.6] Preparations for 1.9.6.10

[gk at torproject.org]

commit 4a00ac48dc4bf4663eb5953e1a5c89c2fd91a427
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Jan 17 12:20:19 2017 +0000

    Preparations for 1.9.6.10
    
    Version bump, changelog update
---
 src/CHANGELOG   | 8 ++++++++
 src/install.rdf | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 8120096..0f4c6e8 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,11 @@
+1.9.6.10
+ * Bug 20951: Back out Unix domain socket related patches for Tor Browser 6.5
+ * Bug 19898: Use DuckDuckGo on about:tor
+ * Bug 21091: Hide the update check menu entry when running under the sandbox
+ * Bug 21131: Remove 2016 donation banner
+ * Bug 14429: Make sure the automatic resizing is disabled
+ * Translation updates
+
 1.9.6.9
  * Bug 20947: Donation banner improvements
 
diff --git a/src/install.rdf b/src/install.rdf
index 7374c4c..5e716b3 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.9</em:version>
+        <em:version>1.9.6.10</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>