From 8aaaba3ec798327ab5ab52c977fb7395b56c54a4 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 18 Dec 2024 09:35:05 -1000
Subject: [PATCH] Release 3.11.11 (#10181)

---
 CHANGES.rst               | 74 +++++++++++++++++++++++++++++++++++++++
 CHANGES/10093.bugfix.rst  |  2 --
 CHANGES/10099.bugfix.rst  |  1 -
 CHANGES/10149.misc.rst    |  4 ---
 CHANGES/10154.bugfix.rst  |  1 -
 CHANGES/10156.feature.rst |  3 --
 CHANGES/10169.bugfix.rst  |  3 --
 aiohttp/__init__.py       |  2 +-
 8 files changed, 75 insertions(+), 15 deletions(-)
 delete mode 100644 CHANGES/10093.bugfix.rst
 delete mode 100644 CHANGES/10099.bugfix.rst
 delete mode 100644 CHANGES/10149.misc.rst
 delete mode 100644 CHANGES/10154.bugfix.rst
 delete mode 100644 CHANGES/10156.feature.rst
 delete mode 100644 CHANGES/10169.bugfix.rst

diff --git a/CHANGES.rst b/CHANGES.rst
index 586d70c9697..b07cec6a093 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,80 @@
 
 .. towncrier release notes start
 
+3.11.11 (2024-12-18)
+====================
+
+Bug fixes
+---------
+
+- Updated :py:meth:`~aiohttp.ClientSession.request` to reuse the ``quote_cookie`` setting from ``ClientSession._cookie_jar`` when processing cookies parameter.
+  -- by :user:`Cycloctane`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`10093`.
+
+
+
+- Fixed type of ``SSLContext`` for some static type checkers (e.g. pyright).
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`10099`.
+
+
+
+- Updated :meth:`aiohttp.web.StreamResponse.write` annotation to also allow :class:`bytearray` and :class:`memoryview` as inputs -- by :user:`cdce8p`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`10154`.
+
+
+
+- Fixed a hang where a connection previously used for a streaming
+  download could be returned to the pool in a paused state.
+  -- by :user:`javitonino`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`10169`.
+
+
+
+
+Features
+--------
+
+- Enabled ALPN on default SSL contexts. This improves compatibility with some
+  proxies which don't work without this extension.
+  -- by :user:`Cycloctane`.
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`10156`.
+
+
+
+
+Miscellaneous internal changes
+------------------------------
+
+- Fixed an infinite loop that can occur when using aiohttp in combination
+  with `async-solipsism`_ -- by :user:`bmerry`.
+
+  .. _async-solipsism: https://github.com/bmerry/async-solipsism
+
+
+  *Related issues and pull requests on GitHub:*
+  :issue:`10149`.
+
+
+
+
+----
+
+
 3.11.10 (2024-12-05)
 ====================
 
diff --git a/CHANGES/10093.bugfix.rst b/CHANGES/10093.bugfix.rst
deleted file mode 100644
index 4d7076115d9..00000000000
--- a/CHANGES/10093.bugfix.rst
+++ /dev/null
@@ -1,2 +0,0 @@
-Update :py:meth:`~aiohttp.ClientSession.request` to reuse the ``quote_cookie`` setting from ``ClientSession._cookie_jar`` when processing cookies parameter.
--- by :user:`Cycloctane`.
diff --git a/CHANGES/10099.bugfix.rst b/CHANGES/10099.bugfix.rst
deleted file mode 100644
index 718420a6ad5..00000000000
--- a/CHANGES/10099.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Fixed type of ``SSLContext`` for some static type checkers (e.g. pyright).
diff --git a/CHANGES/10149.misc.rst b/CHANGES/10149.misc.rst
deleted file mode 100644
index 61765a50fcf..00000000000
--- a/CHANGES/10149.misc.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fixed an infinite loop that can occur when using aiohttp in combination
-with `async-solipsism`_ -- by :user:`bmerry`.
-
-.. _async-solipsism: https://github.com/bmerry/async-solipsism
diff --git a/CHANGES/10154.bugfix.rst b/CHANGES/10154.bugfix.rst
deleted file mode 100644
index 382d9e56e6c..00000000000
--- a/CHANGES/10154.bugfix.rst
+++ /dev/null
@@ -1 +0,0 @@
-Updated :meth:`aiohttp.web.StreamResponse.write` annotation to also allow :class:`bytearray` and :class:`memoryview` as inputs -- by :user:`cdce8p`.
diff --git a/CHANGES/10156.feature.rst b/CHANGES/10156.feature.rst
deleted file mode 100644
index 0ff6b6b8bd8..00000000000
--- a/CHANGES/10156.feature.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Enabled ALPN on default SSL contexts. This improves compatibility with some
-proxies which don't work without this extension.
--- by :user:`Cycloctane`.
diff --git a/CHANGES/10169.bugfix.rst b/CHANGES/10169.bugfix.rst
deleted file mode 100644
index 32e06783856..00000000000
--- a/CHANGES/10169.bugfix.rst
+++ /dev/null
@@ -1,3 +0,0 @@
-Fixed a hang where a connection previously used for a streaming
-download could be returned to the pool in a paused state.
--- by :user:`javitonino`.
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
index f4d732b8674..b9af3f829f7 100644
--- a/aiohttp/__init__.py
+++ b/aiohttp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "3.11.11.dev0"
+__version__ = "3.11.11"
 
 from typing import TYPE_CHECKING, Tuple