Merge branch 'master' into ci/split-cargo-semver-checks

libp2p · Sep 3, 2023 · d7090f9 · d7090f9
2 parents a63932f + 955da49
commit d7090f9
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,6 +8,11 @@ updates:
     commit-message:
       prefix: "deps"
     rebase-strategy: "disabled"
+    groups:
+      trust-dns:
+        patterns:
+          - "trust-dns-*"
+          - "async-std-resolver"
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ log = "0.4"
 parking_lot = "0.12.0"
 quinn = { version = "0.10.2", default-features = false, features = ["tls-rustls", "futures-io"] }
 rand = "0.8.5"
-rustls = { version = "0.21.6", default-features = false }
+rustls = { version = "0.21.7", default-features = false }
 thiserror = "1.0.44"
 tokio = { version = "1.32.0", default-features = false, features = ["net", "rt", "time"], optional = true }
 socket2 = "0.5.3"

diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
@@ -22,7 +22,7 @@ yasna = "0.5.2"
 
 # Exposed dependencies. Breaking changes to these are breaking changes to us.
 [dependencies.rustls]
-version = "0.21.6"
+version = "0.21.7"
 default-features = false
 features = ["dangerous_configuration"] # Must enable this to allow for custom verification code.