[tbb-commits] [torbutton/master] Update changelog for 1.6.12.0.

[mikeperry at torproject.org]

commit ff97c029c4ae47e278c3304c178cd92cfa142415
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Aug 4 19:32:52 2014 -0700

    Update changelog for 1.6.12.0.
---
 src/CHANGELOG   |    4 ++++
 src/install.rdf |    2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index 7f04c4d..5b35a6a 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,7 @@
+1.6.12.0
+ 4 Aug 2014
+ * Bug 9531: Workaround to avoid rare hangs during New Identity
+
 1.6.11.1
  24 Jul 2014
  * Bug 11472: Adjust about:tor font and logo positioning to avoid overlap
diff --git a/src/install.rdf b/src/install.rdf
index 6a3aded..f8c0f97 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.11.1</em:version>
+        <em:version>1.6.12.0</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>