Merge remote-tracking branch 'upstream/master' into HEAD

core/Cargo.toml

@@ -13,7 +13,7 @@ categories = ["network-programming", "asynchronous"]
 asn1_der = "0.6.1"
 bs58 = "0.3.0"
 bytes = "0.4"
-ed25519-dalek = "1.0.0-pre.2"
+ed25519-dalek = "1.0.0-pre.3"
 failure = "0.1"
 fnv = "1.0"
 futures = { version = "0.3.1", features = ["compat", "io-compat", "executor", "thread-pool"] }

misc/multistream-select/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "multistream-select"
 description = "Multistream-select negotiation protocol for libp2p"
-version = "0.6.0"
+version = "0.6.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"

protocols/noise/src/io.rs

@@ -427,7 +427,6 @@ impl<T: AsyncWrite + Unpin> AsyncWrite for NoiseOutput<T> {
         ready!(self.as_mut().poll_flush(cx))?;
         Pin::new(&mut self.io).poll_close(cx)
     }
-
 }
 
 /// Read 2 bytes as frame length from the given source into the given buffer.

src/lib.rs

@@ -142,7 +142,7 @@
 //! [`PublicKey`]: identity::PublicKey
 //! [`Future`]: futures::Future
 //! [`TcpConfig`]: tcp::TcpConfig
-//! [`NetworkBehaviour`]: core::swarm::NetworkBehaviour
+//! [`NetworkBehaviour`]: swarm::NetworkBehaviour
 //! [`StreamMuxer`]: core::muxing::StreamMuxer
 //! [`Yamux`]: yamux::Yamux
 //!