Merge remote-tracking branch 'upstream/master' into identify-merge-co…

…nnec-reuse
libp2p · Mar 7, 2018 · 03c4c8f · 03c4c8f
2 parents b22f500 + 39dde30
commit 03c4c8f
Show file tree

Hide file tree

Showing 28 changed files with 722 additions and 592 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,6 +3,7 @@ members = [
     "multistream-select",
     "datastore",
     "example",
+    "libp2p-dns",
     "libp2p-identify",
     "libp2p-peerstore",
     "libp2p-ping",
@@ -12,7 +13,6 @@ members = [
     "libp2p-websocket",
     "multistream-select",
     "datastore",
-    "futures-mutex",
     "rust-multiaddr",
     "rw-stream-sink",
     "circular-buffer",

diff --git a/futures-mutex/Cargo.toml b/futures-mutex/Cargo.toml
diff --git a/futures-mutex/LICENSE b/futures-mutex/LICENSE
diff --git a/futures-mutex/README.md b/futures-mutex/README.md