[nodejs-request/f18] (5 commits) ...Merge branch 'master' into f18

[T.C. Hollingsworth]

Summary of changes:

  3fe44d4... restrict to compatible arches (*)
  be0cac0... new upstream release 2.21.0 (*)
  7bddf49... fix deps (*)
  17a0803... new upstream release 2.25.0 (*)
  ec87fb8... Merge branch 'master' into f18 (*)

(*) This commit already existed in another branch; no separate mail sent