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

[gk at torproject.org]

commit cd85d9dd4e0a225688d1785ff4cb421abca1e16a
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Sep 18 17:45:16 2018 +0000

    Release preparations for 2.1
    
    Changelog update and version bump
---
 src/CHANGELOG   | 5 +++++
 src/install.rdf | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 562842e9..8bffbe8b 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,8 @@
+2.1
+ * Bug 27175: Add pref to allow users to persist custom noscript settings
+ * Bug 27760: Use new NoScript API for IPC and fix about:blank issue
+ * Bug 21263: Remove outdated information from the README
+
 2.0.7
  * Bug 27097: Tor News signup banner
  * Bug 27663: Add New Identity menuitem again
diff --git a/src/install.rdf b/src/install.rdf
index cd14a7dd..5df0f129 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>2.0.7</em:version>
+        <em:version>2.1</em:version>
         <em:multiprocessCompatible>true</em:multiprocessCompatible>
         <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
         <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>