Auto merge of #2770 - alexcrichton:new-curl, r=brson

Update to curl 0.3

diff --cc Cargo.lock
index 257498e8f80b66669768c10b29b368f506c66d24,860297bbd9f45625de08f542635b9b496ea24a63..7ed935d1b042534974541a959a5cb6b965bbf22a
--- 1/Cargo.lock
--- 2/Cargo.lock
+++ b/Cargo.lock
@@@ -4,11 -4,9 +4,10 @@@ version = "0.12.0
  dependencies = [
   "advapi32-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "bufstream 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 - "crates-io 0.2.0",
 + "cargotest 0.1.0",
 + "crates-io 0.4.0",
   "crossbeam 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-  "curl 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
-  "curl-sys 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
+  "curl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "docopt 0.6.78 (registry+https://github.com/rust-lang/crates.io-index)",
   "env_logger 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -92,9 -69,9 +91,9 @@@ dependencies = 
  
  [[package]]
  name = "crates-io"
 -version = "0.2.0"
 +version = "0.4.0"
  dependencies = [
-  "curl 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
+  "curl 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "rustc-serialize 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)",
   "url 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]

diff --cc Cargo.toml
index cd99d7d1df596fcf635352797f6f2e01215fcbb2,2b0c4acbb269186f521aa0212aeb9687907d85c8..43dca3be7db3628527c3a725d4ef0b8f87e32c25
--- 1/Cargo.toml
--- 2/Cargo.toml
+++ b/Cargo.toml
@@@ -18,10 -18,9 +18,9 @@@ path = "src/cargo/lib.rs
  
  [dependencies]
  advapi32-sys = "0.1"
 -crates-io = { path = "src/crates-io", version = "0.2" }
 +crates-io = { path = "src/crates-io", version = "0.4" }
  crossbeam = "0.2"
- curl = "0.2"
- curl-sys = "0.1"
+ curl = "0.3"
  docopt = "0.6"
  env_logger = "0.3"
  filetime = "0.1"

diff --cc src/crates-io/Cargo.toml
Simple merge