Merge branch '3.10' into 3.11

aio-libs · Aug 19, 2024 · 64c36e2 · 64c36e2
2 parents bc996df + ec453ba
commit 64c36e2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 3 deletions.
diff --git 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
diff --git a/CHANGES/8742.bugfix.rst b/CHANGES/8742.bugfix.rst
diff --git a/CHANGES/8747.misc.rst b/CHANGES/8747.misc.rst