[tor-commits] [torbutton/master] Update versions and changelog.

[mikeperry at torproject.org]

commit ffba18668c3d243386f22368750a568024d0c85e
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Thu Aug 30 14:45:33 2012 -0700

    Update versions and changelog.
---
 README.RELEASE  |    2 +-
 src/CHANGELOG   |    4 ++++
 src/install.rdf |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.RELEASE b/README.RELEASE
index 206a84e..77e75e9 100644
--- a/README.RELEASE
+++ b/README.RELEASE
@@ -5,7 +5,7 @@
 
 #. Decide the version number.
 
-   export VERSION="1.4.6"
+   export VERSION="1.4.6.1"
    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 5a5c3ba..df682d0 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,7 @@
+1.4.6.1
+ 30 Aug 2012
+  * Bug 6737: Disable window.screen hooks for FF15+ (fixes exception alert)
+
 1.4.6
  30 May 2012
   * Bug 5710: Prevent all sessionstore data saving in TBB
diff --git a/src/install.rdf b/src/install.rdf
index e6c3be6..7eac84a 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -10,7 +10,7 @@
                    em:name="Torbutton"
                    em:creator="Mike Perry"
                    em:id="{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}"
-                   em:version="1.4.6"
+                   em:version="1.4.6.1"
                    em:homepageURL="https://www.torproject.org/torbutton/"
                    em:optionsURL="chrome://torbutton/content/preferences.xul"
                    em:iconURL="chrome://torbutton/skin/tor.png"