Merge 'tokio-util-0.6.x' into 'tokio-util-0.7.x'

tokio-rs · May 14, 2022 · 42d5a9f · 42d5a9f
2 parents cf94ffc + cdb132d
commit 42d5a9f
Show file tree

Hide file tree

Showing 7 changed files with 610 additions and 1,495 deletions.
diff --git a/tokio-util/CHANGELOG.md b/tokio-util/CHANGELOG.md
@@ -49,6 +49,12 @@
 [#4214]: https://github.com/tokio-rs/tokio/pull/4214
 [#4241]: https://github.com/tokio-rs/tokio/pull/4241
 
+# 0.6.10 (May 14, 2021)
+
+This is a backport for a memory leak in `CancellationToken`. ([#4652])
+
+[#4652]: https://github.com/tokio-rs/tokio/pull/4652
+
 # 0.6.9 (October 29, 2021)
 
 ### Added

diff --git a/tokio-util/Cargo.toml b/tokio-util/Cargo.toml
@@ -34,7 +34,7 @@ rt = ["tokio/rt", "tokio/sync", "futures-util"]
 __docs_rs = ["futures-util"]
 
 [dependencies]
-tokio = { version = "1.6.0", path = "../tokio", features = ["sync"] }
+tokio = { version = "1.7.0", path = "../tokio", features = ["sync"] }
 
 bytes = "1.0.0"
 futures-core = "0.3.0"