Merge branch 'master' of https://github.com/rust-lang-nursery/rustup.rs…

… into android-x86_64 Conflicts: Cargo.lock
rust-lang · May 9, 2017 · d9e680c · d9e680c
2 parents 4501d91 + 49c6fe2
commit d9e680c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/download/Cargo.toml b/src/download/Cargo.toml
@@ -17,7 +17,7 @@ rustls-backend = ["hyper", "env_proxy", "rustls", "lazy_static", "ca-loader"]
 [dependencies]
 error-chain = "0.7.1"
 url = "1.1"
-curl = { version = "0.4", optional = true }
+curl = { version = "0.4.6", optional = true }
 lazy_static = { version = "0.2", optional = true }
 native-tls = { version = "0.1", optional = true }