From 9c72011fd72099f02b7b9ec0f55b83f472bd11a7 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 23 Jun 2015 10:12:19 +0100
Subject: [PATCH 1/5] Bumb version

---
 synapse/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/__init__.py b/synapse/__init__.py
index d111335a1a..1f09df79cd 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.9.2-r2"
+__version__ = "0.9.3-rc1"

From f043b14bc024e5b05cf4356b301f3ea75a4c9674 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 23 Jun 2015 10:22:42 +0100
Subject: [PATCH 2/5] Update change log

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 62aecda27a..caebde3341 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,21 @@
+Changes in synapse v0.9.3 (2015-XX-XX)
+======================================
+
+General:
+
+* Fix a memory leak in the notifier. (SYN-412)
+* Improve performance of room initial sync. (SYN-418)
+* General improvements to logging.
+* Remove ``access_token`` query params from ``INFO`` level logging.
+
+Configuration:
+
+* Add support for specifying and configuring multiple listeners. (SYN-389)
+
+Application services:
+
+* Fix bug where synapse failed to send user queries to application services.
+
 Changes in synapse v0.9.2-r2 (2015-06-15)
 =========================================
 

From 11374a77efda1790ab845b52294e2435b50c4e75 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 27 Jun 2015 16:59:47 +0200
Subject: [PATCH 3/5] clarify readme a bit more

---
 README.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 259fbaf459..21e3479687 100644
--- a/README.rst
+++ b/README.rst
@@ -122,7 +122,10 @@ To install the synapse homeserver run::
     $ pip install --process-dependency-links https://github.com/matrix-org/synapse/tarball/master
 
 This installs synapse, along with the libraries it uses, into a virtual
-environment under ``~/.synapse``.
+environment under ``~/.synapse``.  Feel free to pick a different directory
+if you prefer.
+
+In case of problems, please see the _Troubleshooting section below.
 
 Alternatively, Silvio Fricke has contributed a Dockerfile to automate the
 above in Docker at https://registry.hub.docker.com/u/silviof/docker-matrix/.

From 480d7203882c71fdee15d464766ba459ac065133 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 1 Jul 2015 15:12:32 +0100
Subject: [PATCH 4/5] Bump changelog and version to v0.9.3

---
 CHANGES.rst         | 7 ++++++-
 synapse/__init__.py | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index caebde3341..6a5fce899a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,11 @@
-Changes in synapse v0.9.3 (2015-XX-XX)
+Changes in synapse v0.9.3 (2015-07-01)
 ======================================
 
+No changes from v0.9.3 Release Candidate 1.
+
+Changes in synapse v0.9.3-rc1 (2015-06-23)
+==========================================
+
 General:
 
 * Fix a memory leak in the notifier. (SYN-412)
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1f09df79cd..96e37308d6 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.9.3-rc1"
+__version__ = "0.9.3"

From 04192ee05b79310e556753a0029a44aa953c8754 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Wed, 8 Jul 2015 17:49:15 +0100
Subject: [PATCH 5/5] typo

---
 synapse/config/tls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/synapse/config/tls.py b/synapse/config/tls.py
index ecb2d42c1f..ad8c5c8cad 100644
--- a/synapse/config/tls.py
+++ b/synapse/config/tls.py
@@ -91,7 +91,7 @@ class TlsConfig(Config):
                 )
 
         if not os.path.exists(tls_certificate_path):
-            with open(tls_certificate_path, "w") as certifcate_file:
+            with open(tls_certificate_path, "w") as certificate_file:
                 cert = crypto.X509()
                 subject = cert.get_subject()
                 subject.CN = config["server_name"]
@@ -106,7 +106,7 @@ class TlsConfig(Config):
 
                 cert_pem = crypto.dump_certificate(crypto.FILETYPE_PEM, cert)
 
-                certifcate_file.write(cert_pem)
+                certificate_file.write(cert_pem)
 
         if not os.path.exists(tls_dh_params_path):
             if GENERATE_DH_PARAMS: