From c46ab352f6046522b4ac096418367bbd12d76ae6 Mon Sep 17 00:00:00 2001
From: Aymeric Augustin <aymeric.augustin@m4x.org>
Date: Wed, 29 Mar 2017 15:47:49 +0200
Subject: [PATCH] Add changelog and bump version number.

---
 docs/changelog.rst    | 9 ++++++++-
 docs/conf.py          | 4 ++--
 websockets/version.py | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index bdb9dae81..dc0ae5f04 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,11 +1,18 @@
 Changelog
 ---------
 
-3.3
+3.4
 ...
 
 *In development*
 
+3.3
+...
+
+* Reduced noise in logs caused by connection resets.
+
+* Avoided crashing on concurrent writes on slow connections.
+
 3.2
 ...
 
diff --git a/docs/conf.py b/docs/conf.py
index aabe2a92e..258b57ede 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '3.2'
+version = '3.3'
 # The full version, including alpha/beta/rc tags.
-release = '3.2'
+release = '3.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/websockets/version.py b/websockets/version.py
index 7970055a9..680144bc4 100644
--- a/websockets/version.py
+++ b/websockets/version.py
@@ -1 +1 @@
-version = '3.2'
+version = '3.3'