From 2afa276c8c31f7eeafa42f112a8b8507078ce15a Mon Sep 17 00:00:00 2001
From: Alice Ryhl <alice@ryhl.io>
Date: Thu, 28 Jan 2021 15:35:37 +0100
Subject: [PATCH] chore: prepare Tokio 0.2.25 (#3478)

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

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index a025af930..025da0143 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,3 +1,14 @@
+# 0.2.25 (January 28, 2021)
+
+### Changes
+
+- chore: upgrade mio dependency (#3207)
+- runtime: update panic messages to include version (#3460)
+
+### Fixes
+
+- task: add missing feature flags for `task_local` (#3236)
+
 # 0.2.24 (December 7, 2020)
 
 ### Fixes
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 647c6c974..0c115c92d 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.24"
+version = "0.2.25"
 edition = "2018"
 authors = ["Tokio Contributors <team@tokio.rs>"]
 license = "MIT"
 readme = "README.md"
-documentation = "https://docs.rs/tokio/0.2.24/tokio/"
+documentation = "https://docs.rs/tokio/0.2.25/tokio/"
 repository = "https://github.com/tokio-rs/tokio"
 homepage = "https://tokio.rs"
 description = """
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
index 09fc4f20f..24b1d48cf 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.24")]
+#![doc(html_root_url = "https://docs.rs/tokio/0.2.25")]
 #![allow(
     clippy::cognitive_complexity,
     clippy::large_enum_variant,