Merge branch 'master' into kademlia-emit-new-external-addr-of-peer

README.md

@@ -102,4 +102,4 @@ Conduct](https://github.com/ipfs/community/blob/master/code-of-conduct.md).
 - [Substrate](https://github.com/paritytech/substrate) - Framework for blockchain innovation,
 used by [Polkadot](https://www.parity.io/technologies/polkadot/).
 - [Taple](https://github.com/opencanarias/taple-core) - Sustainable DLT for asset and process traceability by [OpenCanarias](https://www.opencanarias.com/en/).
-- [Ceylon](https://github.com/ceylonai/ceylon) - A Multi-Agent System (MAS) Development Framwork.
+- [Ceylon](https://github.com/ceylonai/ceylon) - A Multi-Agent System (MAS) Development Framework.

funding.json

@@ -0,0 +1,5 @@
+{
+  "opRetro": {
+    "projectId": "0x966804cb492e1a4bde5d781a676a44a23d69aa5dd2562fa7a4f95bb606021c8b"
+  }
+}

protocols/autonat/src/v2.rs

@@ -4,8 +4,8 @@
 //!
 //! The new version fixes the issues of the first version:
 //! - The server now always dials back over a newly allocated port. This greatly reduces the risk of
-//!     false positives that often occured in the first version, when the clinet-server connection
-//!     occured over a hole-punched port.
+//!     false positives that often occurred in the first version, when the clinet-server connection
+//!     occurred over a hole-punched port.
 //! - The server protects against DoS attacks by requiring the client to send more data to the
 //!     server then the dial back puts on the client, thus making the protocol unatractive for an
 //!     attacker.

transports/tcp/src/lib.rs

@@ -173,7 +173,7 @@ impl Config {
     ///
     /// The new implementation works on a per-connaction basis, defined by the behaviour. This
     /// removes the necessaity to configure the transport for port reuse, instead the behaviour
-    /// requiring this behaviour can decide wether to use port reuse or not.
+    /// requiring this behaviour can decide whether to use port reuse or not.
     ///
     /// The API to configure port reuse is part of [`Transport`] and the option can be found in
     /// [`libp2p_core::transport::DialOpts`].