Merge branch 'master' into devel

Made sure not to revert the run-velocity change that was reverted on
master.

History.md

@@ -141,6 +141,15 @@
 
 * Use the newer `ios-sim` binary, compiled with Xcode 6 on OS X Mavericks.
 
+
+## v.1.0.3.2, 2015-Feb-25
+
+* Fix regression in 1.0.3 where the `meteor` tool could crash when downloading
+  the second build of a given package version; for example, when running `meteor
+  deploy` on an OSX or 32-bit Linux system for an app containing a binary
+  package.  #3761
+
+
 ## v.1.0.3.1, 2015-Jan-20
 
 * Rewrite `meteor show` and `meteor search` to show package information for

docs/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.3.1
+METEOR@1.0.3.2

docs/client/helpers.js

@@ -1,4 +1,4 @@
-release = Meteor.release ? "1.0.3.1" : "(checkout)";
+release = Meteor.release ? "1.0.3.2" : "(checkout)";
 
 Template.registerHelper("release", release);
 

examples/clock/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.3.1
+METEOR@1.0.3.2

examples/leaderboard/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.3.1
+METEOR@1.0.3.2

examples/localmarket/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.3.1
+METEOR@1.0.3.2

examples/todos/.meteor/release

@@ -1 +1 @@
-METEOR@1.0.3.1
+METEOR@1.0.3.2

packages/meteor-tool/package.js

@@ -1,6 +1,6 @@
 Package.describe({
   summary: "The Meteor command-line tool",
-  version: '1.1.0-winr.9'
+  version: '1.0.41'
 });
 
 Package.includeTool();

scripts/admin/banners.json

@@ -5,8 +5,14 @@
                    "0.9.2.1", "0.9.2.2", "0.9.3", "0.9.3.1", "0.9.4", "1.0", "1.0.1", "1.0.2", "1.0.2.1",
                    "1.0.3"],
       "banner": {
-        "text": "=> Meteor 1.0.3.1: README.md support in Isobuild and improvements to `meteor show`.\n\n  This release is being downloaded in the background. Update your app to\n   Meteor 1.0.3.1 by running 'meteor update'."
+        "text": "=> Meteor 1.0.3.2: README.md support in Isobuild and improvements to `meteor show`.\n\n  This release is being downloaded in the background. Update your app to\n   Meteor 1.0.3.2 by running 'meteor update'."
        }
+    },
+    {
+        "versions": ["1.0.3.1"],
+        "banner": {
+            "text": "=> Meteor 1.0.3.2: Fixes a crash in `meteor deploy`.\n\n  This release is being downloaded in the background. Update your app to\n   Meteor 1.0.3.2 by running 'meteor update'."
+        }
     }
   ]
 }

scripts/admin/meteor-release-official.json

@@ -1,6 +1,7 @@
 {
     "track": "METEOR",
-    "version": "1.0.3.1",
+    "version": "1.0.3.2",
+    "patchFrom": ["1.0.3", "1.0.3.1"],
     "recommended": false,
     "official": true,
     "description": "The Official Meteor Distribution"