Merge branch 'tokio-1.24.x' into master

tokio-rs · Jan 17, 2023 · 42bec96 · 42bec96
2 parents 38a9c6c + 4f6a95b
commit 42bec96
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ Make sure you activated the full features of the tokio crate on Cargo.toml:
 
 ```toml
 [dependencies]
-tokio = { version = "1.24.1", features = ["full"] }
+tokio = { version = "1.24.2", features = ["full"] }
 ```
 Then, on your main.rs:
 

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 1.24.2 (January 17, 2023)
+
+Forward ports 1.18.5 changes.
+
+### Fixed
+
+- io: fix unsoundness in `ReadHalf::unsplit` ([#5375])
+
+[#5375]: https://github.com/tokio-rs/tokio/pull/5375
+
 # 1.24.1 (January 6, 2022)
 
 This release fixes a compilation failure on targets without `AtomicU64` when using rustc older than 1.63. ([#5356])

diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
@@ -6,7 +6,7 @@ name = "tokio"
 #   - README.md
 # - Update CHANGELOG.md.
 # - Create "v1.x.y" git tag.
-version = "1.24.1"
+version = "1.24.2"
 edition = "2018"
 rust-version = "1.49"
 authors = ["Tokio Contributors <[email protected]>"]

diff --git a/tokio/README.md b/tokio/README.md
@@ -56,7 +56,7 @@ Make sure you activated the full features of the tokio crate on Cargo.toml:
 
 ```toml
 [dependencies]
-tokio = { version = "1.24.1", features = ["full"] }
+tokio = { version = "1.24.2", features = ["full"] }
 ```
 Then, on your main.rs: