Merge remote-tracking branch 'upstream/master' into dp/chore/test-raw…

…_swarm

* upstream/master:
  Use paritytech/rust-secp256k1 (libp2p#598)
  Use websocket 0.21.0 (libp2p#597)

protocols/secio/Cargo.toml

@@ -12,8 +12,7 @@ libp2p-core = { path = "../../core" }
 log = "0.4.1"
 protobuf = "2.0.2"
 rand = "0.5"
-# TODO: use the paritytech repo after https://github.com/paritytech/rust-secp256k1/pull/14
-eth-secp256k1 = { git = "https://github.com/tomaka/rust-secp256k1", branch = "pub-rand", optional = true }
+eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1", optional = true }
 aes-ctr = "0.1.0"
 aesni = { version = "0.4.1", features = ["nocheck"], optional = true }
 twofish = "0.1.0"

transports/websocket/Cargo.toml

@@ -13,9 +13,7 @@ rw-stream-sink = { path = "../../misc/rw-stream-sink" }
 tokio-io = "0.1"
 
 [target.'cfg(not(target_os = "emscripten"))'.dependencies]
-# TODO: restore the upstream version once the branch is merged
-websocket = { git = "https://github.com/tomaka/rust-websocket", branch = "send", default-features = false, features = ["async", "async-ssl"] }
-#websocket = { version = "0.20.2", default-features = false, features = ["async", "async-ssl"] }
+websocket = { version = "0.21.0", default-features = false, features = ["async", "async-ssl"] }
 
 [target.'cfg(target_os = "emscripten")'.dependencies]
 stdweb = { version = "0.1.3", default-features = false }