From ec453ba6d1cf8f5bb502f2e2a861c463e755f387 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Mon, 19 Aug 2024 13:56:06 -0500
Subject: [PATCH] Release 3.10.5 (#8754)

---
 CHANGES.rst             | 30 ++++++++++++++++++++++++++++++
 CHANGES/8736.misc.rst   |  1 -
 CHANGES/8742.bugfix.rst |  1 -
 CHANGES/8747.misc.rst   |  1 -
 aiohttp/__init__.py     |  2 +-
 5 files changed, 31 insertions(+), 4 deletions(-)
 delete mode 100644 CHANGES/8736.misc.rst
 delete mode 100644 CHANGES/8742.bugfix.rst
 delete mode 120000 CHANGES/8747.misc.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index a90142e8505..2bd19de71d6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,36 @@
 
 .. towncrier release notes start
 
+3.10.5 (2024-08-19)
+=========================
+
+Bug fixes
+---------
+
+- Fixed :meth:`aiohttp.ClientResponse.json()` not setting ``status`` when :exc:`aiohttp.ContentTypeError` is raised -- by :user:`bdraco`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`8742`.
+
+
+
+
+Miscellaneous internal changes
+------------------------------
+
+- Improved performance of the WebSocket reader -- by :user:`bdraco`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`8736`, :issue:`8747`.
+
+
+
+
+----
+
+
 3.10.4 (2024-08-17)
 ===================
 
diff --git a/CHANGES/8736.misc.rst b/CHANGES/8736.misc.rst
deleted file mode 100644
index 34ed19aebba..00000000000
--- a/CHANGES/8736.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-Improved performance of the WebSocket reader -- by :user:`bdraco`.
diff --git a/CHANGES/8742.bugfix.rst b/CHANGES/8742.bugfix.rst
deleted file mode 100644
index 850f0390399..00000000000
--- a/CHANGES/8742.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed :meth:`aiohttp.ClientResponse.json()` not setting ``status`` when :exc:`aiohttp.ContentTypeError` is raised -- by :user:`bdraco`.
diff --git a/CHANGES/8747.misc.rst b/CHANGES/8747.misc.rst
deleted file mode 120000
index 9eb648d0e2b..00000000000
--- a/CHANGES/8747.misc.rst
+++ /dev/null
@@ -1 +0,0 @@
-8736.misc.rst
\ No newline at end of file
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
index d54dfedce2c..bd65f92f3c7 100644
--- a/aiohttp/__init__.py
+++ b/aiohttp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "3.10.5.dev0"
+__version__ = "3.10.5"
 
 from typing import TYPE_CHECKING, Tuple