From 3b0fb6aae8d3c886fbdfcd72e4bf94f81eee2daa Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 25 Sep 2014 18:05:06 +0100
Subject: [PATCH] Bump version and changelog

---
 CHANGES.rst         | 22 ++++++++++++++++++++++
 VERSION             |  2 +-
 synapse/__init__.py |  2 +-
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 400ded0f1..00e7cf2c6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,25 @@
+Changes in synapse 0.3.4 (2014-09-25)
+=====================================
+This version adds support for using a TURN server. See docs/turn-howto.rst on
+how to set one up.
+
+Homeserver:
+ * Add support for redaction of messages.
+ * Fix bug where inviting a user on a remote home server could take up to
+   20-30s.
+ * Implement a get current room state API.
+ * Add support specifying and retrieving turn server configuration.
+
+Webclient:
+ * Add support for using TURN for VoIP calls.
+ * Show display name change messages.
+ * Fix bug where the client didn't get the state of a newly joined room
+   until after it has been refreshed.
+ * Fix bugs with tab complete.
+ * Fix bug where holding down the down arrow caused chrome to chew 100% CPU.
+ * Fix bug where desktop notifications occasionally used "Undefined" as the
+   display name.
+
 Changes in synapse 0.3.3 (2014-09-22)
 =====================================
 
diff --git a/VERSION b/VERSION
index 1c09c74e2..42045acae 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.3
+0.3.4
diff --git a/synapse/__init__.py b/synapse/__init__.py
index bba551b2c..a340a5db6 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.3.3"
+__version__ = "0.3.4"