Merge branch 'port-2021-03-09' into 'master'

Port 2021 03 09

See merge request dms3/public/go-libp2p!2

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/libp2p/go-addr-util v0.0.2
 	github.com/libp2p/go-conn-security-multistream v0.2.1
 	github.com/libp2p/go-eventbus v0.2.1
-	//github.com/libp2p/go-libp2p v0.8.1
+//	github.com/libp2p/go-libp2p v0.8.1
 	gitlab.dms3.io/dms3/public/go-libp2p v0.0.0
 	github.com/libp2p/go-libp2p-autonat v0.4.0
 	github.com/libp2p/go-libp2p-blankhost v0.2.0