[tor-commits] [torbutton/master] Update changelog and bump version for 1.5.2.

[mikeperry at torproject.org]

commit 9e64f6341fb4c87a83c08817b05d5ee6b782f7f2
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Mon Apr 22 16:29:59 2013 -0700

    Update changelog and bump version for 1.5.2.
---
 README.RELEASE  |    2 +-
 src/CHANGELOG   |    7 +++++++
 src/install.rdf |    2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.RELEASE b/README.RELEASE
index 09e917a..4236583 100644
--- a/README.RELEASE
+++ b/README.RELEASE
@@ -5,7 +5,7 @@
 
 #. Decide the version number.
 
-   export VERSION="1.4.6.3"
+   export VERSION="1.5.2"
    vim ./src/install.rdf # edit <em:version> tag to reflect version
 
 #. Test upgrades of candidate XPI in latest Firefox and TBB product matrix
diff --git a/src/CHANGELOG b/src/CHANGELOG
index 4bb5f3a..fc4b52e 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,10 @@
+1.5.2:
+ 22 Apr 2013
+  * bug 8457: Allow session restore if the user allows disk actvity
+  * bug 8301: Remove the Display Settings panel and associated locales
+  * bug 6566: Fix "Transparent Torification" option.
+  * bug 8642: Fix a hang on New Identity.
+
 1.5.1:
  07 Mar 2013
   * bug 8324: Fix Drag+Drop crash by using a new TBB drag observer
diff --git a/src/install.rdf b/src/install.rdf
index eb1d505..a5cefa9 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.1</em:version>
+        <em:version>1.5.2</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>