From 1cb5c6011aceb30c04cba2613ee1a9a110ca9ad1 Mon Sep 17 00:00:00 2001
From: Andrew Svetlov <andrew.svetlov@gmail.com>
Date: Tue, 5 Jun 2018 19:56:26 +0300
Subject: [PATCH] Bump to 3.3.1

---
 CHANGES.rst         | 12 ++++++++++++
 CHANGES/3053.bugfix |  1 -
 CHANGES/3054.bugfix |  1 -
 aiohttp/__init__.py |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)
 delete mode 100644 CHANGES/3053.bugfix
 delete mode 100644 CHANGES/3054.bugfix

diff --git a/CHANGES.rst b/CHANGES.rst
index 10d704eff13..033673efa5d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,6 +14,18 @@ Changelog
 
 .. towncrier release notes start
 
+3.3.1 (2018-06-05)
+==================
+
+Bugfixes
+--------
+
+- Fix ``sock_read`` timeout. (`#3053 <https://github.com/aio-libs/aiohttp/pull/3053>`_)
+- When using a server-request body as the `data=` argument of a client request,
+  iterate over the content with `readany` instead of `readline` to avoid `Line
+  too long` errors. (`#3054 <https://github.com/aio-libs/aiohttp/pull/3054>`_)
+
+
 3.3.0 (2018-06-01)
 ==================
 
diff --git a/CHANGES/3053.bugfix b/CHANGES/3053.bugfix
deleted file mode 100644
index 261a7d29281..00000000000
--- a/CHANGES/3053.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix ``sock_read`` timeout.
\ No newline at end of file
diff --git a/CHANGES/3054.bugfix b/CHANGES/3054.bugfix
deleted file mode 100644
index 8276e49266b..00000000000
--- a/CHANGES/3054.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-When using a server-request body as the `data=` argument of a client request, iterate over the content with `readany` instead of `readline` to avoid `Line too long` errors.
diff --git a/aiohttp/__init__.py b/aiohttp/__init__.py
index 450e78e86b4..3d94d229394 100644
--- a/aiohttp/__init__.py
+++ b/aiohttp/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '3.3.0'
+__version__ = '3.3.1'
 
 # This relies on each of the submodules having an __all__ variable.