[tor-commits] [torbutton/master] Release preparations for 2.0

[gk at torproject.org]

commit 3fa7fd3f438805171deb146aab8b417611445147
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 22 08:09:03 2018 +0000

    Release preparations for 2.0
    
    CHANGELOG update and version bump
---
 src/CHANGELOG   | 11 +++++++++++
 src/install.rdf |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 0ea09ce..b5fdb75 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,14 @@
+2.0
+ * Bug 26100: Adapt Torbutton to Firefox 60 ESR
+ * Bug 24309: Move circuit display to the identity popup
+ * Bug 26128: Adapt security slider to the WebExtensions version of NoScript
+ * Bug 23247: Show security state of .onions
+ * Bug 26129: Show our about:tor page on startup
+ * Bug 26235: Hide new unusable items from help menu
+ * Bug 26058: Remove workaround for hiding 'sign in to sync' button
+ * Bug 20628: Add locales bn-BD, da, he, sv, zh-TW
+ * Translations update
+
 1.9.9.1
  * Bug 25126: Make about:tor layout responsive
  * Translations update
diff --git a/src/install.rdf b/src/install.rdf
index 98db46a..919c744 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.9.1</em:version>
+        <em:version>2.0</em:version>
         <em:multiprocessCompatible>true</em:multiprocessCompatible>
         <em:homepageURL>https://www.torproject.org/projects/torbrowser.html.en</em:homepageURL>
         <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL>