Merge branch 'tokio-1.29.x' into merge-1.29.x

tokio-rs · Jun 29, 2023 · 9dbf187 · 9dbf187
2 parents 6e990eb + 1b1b9dc
commit 9dbf187
Show file tree

Hide file tree

Showing 4 changed files with 11 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.29.0", features = ["full"] }
+tokio = { version = "1.29.1", features = ["full"] }
 ```
 Then, on your main.rs:
 

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.29.1 (June 29, 2023)
+
+### Fixed
+
+- rt: fix nesting two `block_in_place` with a `block_on` between ([#5837])
+
+[#5837]: https://github.com/tokio-rs/tokio/pull/5837
+
 # 1.29.0 (June 27, 2023)
 
 Technically a breaking change, the `Send` implementation is removed from

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.29.0"
+version = "1.29.1"
 edition = "2021"
 rust-version = "1.56"
 authors = ["Tokio Contributors <team@tokio.rs>"]

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.29.0", features = ["full"] }
+tokio = { version = "1.29.1", features = ["full"] }
 ```
 Then, on your main.rs: