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

[gk at torproject.org]

commit 391ea08d24b00bd161e7916ff62d572d9102d375
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Mar 3 09:52:03 2017 +0000

    Release preparations for 1.9.7.1
    
    Version bump, and CHANGELOG update
---
 src/CHANGELOG   | 16 ++++++++++++++++
 src/install.rdf |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 80b22e3..bc1092b 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,10 @@
+1.9.7.1
+ * Bug 21396: Allow leaking of resource/chrome URIs (off by default)
+ * Bug 21574: Add link for zh manual and create manual links dynamically
+ * Bug 21330: Non-usable scrollbar appears in tor browser security settings
+ * Bug 21324: Don't update NoScript button with timer update
+ * Translation updates
+
 1.9.7
  * Bug 19898: Use DuckDuckGo on about:tor
  * Bug 21091: Hide the update check menu entry when running under the sandbox
@@ -6,6 +13,15 @@
  * Bug 21131: Remove 2016 donation banner
  * Translation updates
 
+1.9.6.12
+ * Bug 20951: Back out Unix domain socket related patches for Tor Browser 6.5
+ * Bug 19898: Use DuckDuckGo on about:tor
+ * Bug 21243: Add links to es, fr, and pt Tor Browser manual
+ * 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 6c9572d..3077598 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.7</em:version>
+        <em:version>1.9.7.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>