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

[gk at torproject.org]

commit 68ad9e3d555d18d894c2ae0a1e8b3e797642ff54
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Nov 29 21:30:25 2018 +0000

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

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 468d2a99..0db59514 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,14 @@
+2.1.2
+ * Bug 25013: Integrate Torbutton into tor-browser for Android
+ * Bug 27111: Update about:tor desktop version to work on mobile
+ * Bug 28093: Update donation banner style to make it fit in small screens
+ * Bug 28543: about:tor has scroll bar between widths 900px and 1000px
+ * Bug 28039: Enable dump() if log method is 0
+ * Bug 27701: Don't show App Blocker dialog on Android
+ * Bug 28187: Change tor circuit icon to torbutton.svg
+ * Bug 28515: Use en-US for english Torbutton strings
+ * Translations update
+
 2.1.1
  * Bug 23925+27959: Donation banner for year end 2018 campaign
  * Bug 24172: Donation banner clobbers Tor Browser version string
diff --git a/src/install.rdf b/src/install.rdf
index fcd857a4..45bee11a 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.1.1</em:version>
+        <em:version>2.1.2</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>