From 4bd1193175ed2177ab9e87d213cdaac276f0a046 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Mon, 7 Dec 2020 13:55:03 -0600
Subject: [PATCH 1/2] chore: prepare 0.2.24 release

---
 tokio/CHANGELOG.md | 6 ++++++
 tokio/Cargo.toml   | 6 +++---
 tokio/src/lib.rs   | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index 86a4a6bba44..a025af9308d 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 0.2.24 (December 7, 2020)
+
+### Fixes
+
+ - sync: fix mpsc bug related to closing the channel (#3215)
+
 # 0.2.23 (November 12, 2020)
 
 ### Fixes
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 67c9f393e96..64002d98513 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -8,12 +8,12 @@ name = "tokio"
 #   - README.md
 # - Update CHANGELOG.md.
 # - Create "v0.2.x" git tag.
-version = "0.2.23"
+version = "0.2.24"
 edition = "2018"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 license = "MIT"
 readme = "README.md"
-documentation = "https://docs.rs/tokio/0.2.23/tokio/"
+documentation = "https://docs.rs/tokio/0.2.24/tokio/"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
 description = """
@@ -122,7 +122,7 @@ default-features = false
 optional = true
 
 [dev-dependencies]
-tokio-test = { version = "0.2.0", path = "../tokio-test" }
+tokio-test = { version = "0.2.0" }
 futures = { version = "0.3.0", features = ["async-await"] }
 futures-test = "0.3.0"
 proptest = "0.9.4"
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index 3ca3696558e..09fc4f20f94 100644
--- a/tokio/src/lib.rs
+++ b/tokio/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/tokio/0.2.23")]
+#![doc(html_root_url = "https://docs.rs/tokio/0.2.24")]
 #![allow(
     clippy::cognitive_complexity,
     clippy::large_enum_variant,

From 3384358547664070c8f6ed4d2252bdbac48460b0 Mon Sep 17 00:00:00 2001
From: Luke Steensen <luke.steensen@gmail.com>
Date: Wed, 9 Dec 2020 10:24:24 -0600
Subject: [PATCH 2/2] restore path dependency on tokio-test

---
 tokio/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 64002d98513..adb5b9a2997 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -122,7 +122,7 @@ default-features = false
 optional = true
 
 [dev-dependencies]
-tokio-test = { version = "0.2.0" }
+tokio-test = { version = "0.2.0", path = "../tokio-test" }
 futures = { version = "0.3.0", features = ["async-await"] }
 futures-test = "0.3.0"
 proptest = "0.9.4"