From f12993ec16b57a14f6d304f9cfa5dd50747168a9 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 5 Sep 2016 13:01:14 +0100
Subject: [PATCH 1/4] Bump changelog and version

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 49673ccce4..cc64d3adb1 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,29 @@
+Changes in synapse v0.17.2-rc1 (2016-09-05)
+===========================================
+
+Features:
+
+* Start adding store-and-forward direct-to-device messaging (PR #1046, #1050,
+  #1062, #1066)
+
+
+Changes:
+
+* Avoid pulling the full state of a room out so often (PR #1047, #1049, #1063,
+  #1068)
+* Don't notify for online to online presence transitions. (PR #1054)
+* Occaisonally persist unpersisted presence updates (PR #1055)
+* Allow application services to have an optional 'url' (PR #1056)
+* Clean up old sent transactions from DB (PR #1059)
+
+
+Bug fixes:
+
+* Fix None check in backfill (PR #1043)
+* Fix membership changes to be idempotent (PR #1067)
+
+
+
 Changes in synapse v0.17.1 (2016-08-24)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 43bf78f885..ad2ec58ea4 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.1"
+__version__ = "0.17.2-rc1"

From 19275b3030eb69d575f85526127037b3c221d000 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 5 Sep 2016 13:08:26 +0100
Subject: [PATCH 2/4] Typo

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index cc64d3adb1..7820a4610b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -12,7 +12,7 @@ Changes:
 * Avoid pulling the full state of a room out so often (PR #1047, #1049, #1063,
   #1068)
 * Don't notify for online to online presence transitions. (PR #1054)
-* Occaisonally persist unpersisted presence updates (PR #1055)
+* Occasionally persist unpersisted presence updates (PR #1055)
 * Allow application services to have an optional 'url' (PR #1056)
 * Clean up old sent transactions from DB (PR #1059)
 

From 4ec67a3d2167f3623fea6c22f4544a21f4781203 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 5 Sep 2016 15:52:48 +0100
Subject: [PATCH 3/4] Mention get_pdu bug

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 7820a4610b..1d073119f9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,6 +21,8 @@ Bug fixes:
 
 * Fix None check in backfill (PR #1043)
 * Fix membership changes to be idempotent (PR #1067)
+* Fix bug in get_pdu where it would sometimes return events with incorrect
+  signature
 
 
 

From b152ee71fec06cc52842e19249ff4db849f99d38 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 8 Sep 2016 15:23:44 +0100
Subject: [PATCH 4/4] Bump version and changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 1d073119f9..c40a32abd6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,12 @@
+Changes in synapse v0.17.2 (2016-09-08)
+=======================================
+
+This release contains security bug fixes. Please upgrade.
+
+
+No changes since v0.17.2
+
+
 Changes in synapse v0.17.2-rc1 (2016-09-05)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index ad2ec58ea4..523deaa5ff 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.2-rc1"
+__version__ = "0.17.2"