From 8f650bd3381d8dbf9a41d2c09a37a036ba944724 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 2 Aug 2016 15:43:52 +0100
Subject: [PATCH] Bump changeog and version

---
 CHANGES.rst         | 17 +++++++++++++++++
 synapse/__init__.py |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 03668370a9..7254385f7e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,20 @@
+Changes in synapse v0.17.0-rc2 (2016-08-02)
+===========================================
+
+Changes:
+
+* Forbid non-ASes from registering users whose names begin with '_' (PR #958)
+* Add some basic admin API docs (PR #963)
+
+
+Bug fixes:
+
+* Send the correct host header when fetching keys (PR #941)
+* Fix joining a room that has missing auth events (PR #964)
+* Fix various bush bugs (PR #966, #970)
+* Fix adding emails on registration (PR #968)
+
+
 Changes in synapse v0.17.0-rc1 (2016-07-28)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 8f0176e182..9899944977 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.17.0-rc1"
+__version__ = "0.17.0-rc2"