Merge branch 'master' of github.com:matrix-org/synapse into develop

2 files changed, 2 insertions, 2 deletions

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"
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