[tbb-commits] [torbutton/master] Add changelog and bump version for 1.6.12.1.

[mikeperry at torproject.org]

commit de3791281953327f0472e6e9313e184a7aab2be1
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Fri Aug 29 00:54:29 2014 -0700

    Add changelog and bump version for 1.6.12.1.
---
 src/CHANGELOG   |    5 +++++
 src/install.rdf |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 5b35a6a..0943687 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,8 @@
+1.6.12.1
+ 1 Sep 2014
+ * Bug 12684: Add `canvas.notNow` UI strings to torbutton.properties file.
+ * Bug 8940: Move RecommendedTBBVersions file to www.torproject.org.
+
 1.6.12.0
  4 Aug 2014
  * Bug 9531: Workaround to avoid rare hangs during New Identity
diff --git a/src/install.rdf b/src/install.rdf
index f8c0f97..de66e4e 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.6.12.0</em:version>
+        <em:version>1.6.12.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>