From f4d4f2a646950f7a6c5cfe99de67e03703ec16fa Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 17 Aug 2024 11:40:09 -0500
Subject: [PATCH] Release 3.10.4 (#8731)

---
 CHANGES.rst             | 70 +++++++++++++++++++++++++++++++++++++++++
 CHANGES/3867.bugfix.rst |  1 -
 CHANGES/8680.bugfix.rst |  1 -
 CHANGES/8681.misc.rst   |  3 --
 CHANGES/8685.bugfix.rst |  3 --
 CHANGES/8700.doc.rst    |  1 -
 CHANGES/8720.bugfix.rst |  1 -
 7 files changed, 70 insertions(+), 10 deletions(-)
 delete mode 100644 CHANGES/3867.bugfix.rst
 delete mode 100644 CHANGES/8680.bugfix.rst
 delete mode 100644 CHANGES/8681.misc.rst
 delete mode 100644 CHANGES/8685.bugfix.rst
 delete mode 100644 CHANGES/8700.doc.rst
 delete mode 100644 CHANGES/8720.bugfix.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 43ca69235e3..a90142e8505 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,76 @@
 
 .. towncrier release notes start
 
+3.10.4 (2024-08-17)
+===================
+
+Bug fixes
+---------
+
+- Fixed decoding base64 chunk in BodyPartReader -- by :user:`hyzyla`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`3867`.
+
+
+
+- Fixed a race closing the server-side WebSocket where the close code would not reach the client -- by :user:`bdraco`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`8680`.
+
+
+
+- Fixed unconsumed exceptions raised by the WebSocket heartbeat -- by :user:`bdraco`.
+
+  If the heartbeat ping raised an exception, it would not be consumed and would be logged as an warning.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`8685`.
+
+
+
+- Fixed an edge case in the Python parser when chunk separators happen to align with network chunks -- by :user:`Dreamsorcerer`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`8720`.
+
+
+
+
+Improved documentation
+----------------------
+
+- Added ``aiohttp-apischema`` to supported libraries -- by :user:`Dreamsorcerer`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`8700`.
+
+
+
+
+Miscellaneous internal changes
+------------------------------
+
+- Improved performance of starting request handlers with Python 3.12+ -- by :user:`bdraco`.
+
+  This change is a followup to :issue:`8661` to make the same optimization for Python 3.12+ where the request is connected.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`8681`.
+
+
+
+
+----
+
+
 3.10.3 (2024-08-10)
 ========================
 
diff --git a/CHANGES/3867.bugfix.rst b/CHANGES/3867.bugfix.rst
deleted file mode 100644
index 12376bf6ef0..00000000000
--- a/CHANGES/3867.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed decoding base64 chunk in BodyPartReader -- by :user:`hyzyla`.
diff --git a/CHANGES/8680.bugfix.rst b/CHANGES/8680.bugfix.rst
deleted file mode 100644
index 2149f12aaaf..00000000000
--- a/CHANGES/8680.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed a race closing the server-side WebSocket where the close code would not reach the client. -- by :user:`bdraco`.
diff --git a/CHANGES/8681.misc.rst b/CHANGES/8681.misc.rst
deleted file mode 100644
index 222787d36da..00000000000
--- a/CHANGES/8681.misc.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Improved performance of starting request handlers with Python 3.12+ -- by :user:`bdraco`.
-
-This change is a followup to :issue:`8661` to make the same optimization for Python 3.12+ where the request is connected.
diff --git a/CHANGES/8685.bugfix.rst b/CHANGES/8685.bugfix.rst
deleted file mode 100644
index 8bd20196ee3..00000000000
--- a/CHANGES/8685.bugfix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed unconsumed exceptions raised by the WebSocket heartbeat -- by :user:`bdraco`.
-
-If the heartbeat ping raised an exception, it would not be consumed and would be logged as an warning.
diff --git a/CHANGES/8700.doc.rst b/CHANGES/8700.doc.rst
deleted file mode 100644
index 71157969a75..00000000000
--- a/CHANGES/8700.doc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``aiohttp-apischema`` to supported libraries -- by :user:`Dreamsorcerer`.
diff --git a/CHANGES/8720.bugfix.rst b/CHANGES/8720.bugfix.rst
deleted file mode 100644
index 9941be27530..00000000000
--- a/CHANGES/8720.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed an edge case in the Python parser when chunk separators happen to align with network chunks -- by :user:`Dreamsorcerer`.