[tor-commits] [torbutton/master] Changelog and version bump for 1.6.0.

[mikeperry at torproject.org]

commit 62faf3b4c8cad4183fee34b49a42e00b24a3571c
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Jun 4 23:47:44 2013 -0700

    Changelog and version bump for 1.6.0.
---
 src/CHANGELOG   |    9 +++++++++
 src/install.rdf |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index fc4b52e..0603658 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,12 @@
+1.6.0:
+ 05 Jun 2013
+  * bug 7494: Create a local home page for TBB as about:tor
+  * misc: Perform a control port test of proper Tor configuration by default.
+          Only use check.torproject.org if the control port is unavailable.
+  * misc: Add an icon menu option for Tor Launcher's Network Settings
+  * misc: Add branding string overrides (primarily controls browser name and
+          homepage)
+
 1.5.2:
  22 Apr 2013
   * bug 8457: Allow session restore if the user allows disk actvity
diff --git a/src/install.rdf b/src/install.rdf
index a5cefa9..828214a 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.5.2</em:version>
+        <em:version>1.6.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>