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

2 files changed, 7 insertions, 2 deletions

diff --git a/register_new_matrix_user b/register_new_matrix_user

index daddadc302..4a520bdb5d 100755
--- a/register_new_matrix_user
+++ b/register_new_matrix_user
@@ -49,7 +49,12 @@ def request_registration(user, password, server_location, shared_secret):
         headers={'Content-Type': 'application/json'}
     )
     try:
-        f = urllib2.urlopen(req)
+        if sys.version_info[:3] >= (2, 7, 9):
+            # As of version 2.7.9, urllib2 now checks SSL certs
+            import ssl
+            f = urllib2.urlopen(req, context=ssl.SSLContext(ssl.PROTOCOL_SSLv23))
+        else:
+            f = urllib2.urlopen(req)
         f.read()
         f.close()
         print "Success."
diff --git a/synapse/__init__.py b/synapse/__init__.py

index fd87c7e2d0..56c10a84e9 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.8.1-r3"
+__version__ = "0.8.1-r4"