auto merge of #4198 : Manishearth/servo/hyper-droid, r=Manishearth

This is the Hyper pull request, plus the set up for OpenSSL on Android to make it merge.

Sean's commits have been reviewed in #4065 (My Android changes were reviewed by Glenn)
This commit is contained in:
bors-servo 2014-12-05 04:16:11 -07:00
commit 6bd9bf979b
38 changed files with 927 additions and 477 deletions

View file

@ -22,7 +22,7 @@ extern crate collections;
extern crate geom;
extern crate html5ever;
extern crate encoding;
extern crate http;
extern crate hyper;
extern crate js;
extern crate libc;
extern crate msg;