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 1/3] 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 400ded0f15..00e7cf2c6d 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 1c09c74e22..42045acae2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.3
+0.3.4
diff --git a/synapse/__init__.py b/synapse/__init__.py
index bba551b2c4..a340a5db66 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"

From f1c9ab4e4f97459b6dab8467d112a014468d8325 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 25 Sep 2014 18:10:02 +0100
Subject: [PATCH 2/3] More change log lines

---
 CHANGES.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 00e7cf2c6d..1690490f66 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -11,6 +11,7 @@ Homeserver:
  * Add support specifying and retrieving turn server configuration.
 
 Webclient:
+ * Add button to send messages to users from the home page.
  * 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
@@ -19,6 +20,8 @@ Webclient:
  * 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.
+ * Fix more places where we sometimes saw room IDs incorrectly.
+ * Fix bug which caused lag when entering text in the text box.
 
 Changes in synapse 0.3.3 (2014-09-22)
 =====================================

From ec5fb77a66131382a179c349cf239859be7d8f4e Mon Sep 17 00:00:00 2001
From: David Baker <dbkr@matrix.org>
Date: Thu, 25 Sep 2014 19:18:32 +0200
Subject: [PATCH 3/3] Just use a yaml list for turn servers

---
 docs/turn-howto.rst    | 4 ++--
 synapse/config/voip.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/turn-howto.rst b/docs/turn-howto.rst
index 2cb0c4170d..82b59538c8 100644
--- a/docs/turn-howto.rst
+++ b/docs/turn-howto.rst
@@ -62,8 +62,8 @@ synapse Setup
 
 Your home server configuration file needs the following extra keys:
 
- 1. "turn_uris": This needs to be a comma-separated
-    list of public-facing URIs for your TURN server to be given out 
+ 1. "turn_uris": This needs to be a yaml list
+    of public-facing URIs for your TURN server to be given out 
     to your clients. Add separate entries for each transport your
     TURN server supports.
 
diff --git a/synapse/config/voip.py b/synapse/config/voip.py
index c5131d9bcd..3a51664f46 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -19,7 +19,7 @@ class VoipConfig(Config):
 
     def __init__(self, args):
         super(VoipConfig, self).__init__(args)
-        self.turn_uris = args.turn_uris.split(",") if args.turn_uris else None
+        self.turn_uris = args.turn_uris
         self.turn_shared_secret = args.turn_shared_secret
         self.turn_user_lifetime = args.turn_user_lifetime