[tor-commits] [torbutton/master] Switch the download page back to download-easy.

[mikeperry at torproject.org]

commit 5080bc7a60cbf284bae6a5b0b5ffc2359b092eee
Author: Mike Perry <mikeperry-git at torproject.org>
Date:   Mon Dec 16 14:50:38 2013 -0800

    Switch the download page back to download-easy.
    
    Also bump version and changelog entry.
---
 src/CHANGELOG                   |    4 ++++
 src/chrome/content/torbutton.js |    3 +--
 src/install.rdf                 |    2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/CHANGELOG b/src/CHANGELOG
index befcf4f..033e957 100644
--- a/src/CHANGELOG
+++ b/src/CHANGELOG
@@ -1,3 +1,7 @@
+1.6.5.2:
+ 17 Dec 2013
+ * Misc: Change the default update download link back to download-easy
+
 1.6.5.1:
  10 Dec 2013
  * Bug 10352: Clear FF24 Private Browsing Mode data during New Identity
diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js
index b870048..6298e46 100644
--- a/src/chrome/content/torbutton.js
+++ b/src/chrome/content/torbutton.js
@@ -795,8 +795,7 @@ function torbutton_notify_if_update_needed() {
 }
 
 function torbutton_download_update() {
-    // XXX: We lack a download page for the alphas right now..
-    var downloadURI = "https://blog.torproject.org/category/tags/tbb-30";
+    var downloadURI = "https://www.torproject.org/download/download-easy.html";
     var rtSvc = Components.classes["@mozilla.org/xre/app-info;1"]
                           .getService(Components.interfaces.nsIXULRuntime);
     downloadURI += "?os=" + rtSvc.OS + "&arch=" + rtSvc.XPCOMABI;
diff --git a/src/install.rdf b/src/install.rdf
index 89163bb..cb3f359 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.5.1</em:version>
+        <em:version>1.6.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>