From 3a431a126d50761976a45ec495c63a34a6452f4f Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 17 May 2017 11:26:57 +0100
Subject: [PATCH 1/3] Bump changelog and version

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

diff --git a/CHANGES.rst b/CHANGES.rst
index babeaa0ded..b6068ba995 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,27 @@
+Changes in synapse v0.21.0-rc3 (2017-05-17)
+===========================================
+
+Features:
+
+* Add per user ratelimiting overrides (PR #2208)
+* Add config option to limit maximum number of events requested by ``/sync``
+  and ``/messages`` (PR #2221) Thanks to @psaavedra!
+
+
+Changes:
+
+* Various small performance fixes (PR #2201, #2202, #2224, #2226, #2227, #2228)
+* Update username availability checker API (PR #2209, #2213)
+* When purging, don't de-delta state groups we're about to delete (PR #2214)
+* Documantation to chek synapse version (PR #2215) Thanks to @hamber-dick!
+* Add an index to event_search to speed up purge history API (PR #2218)
+
+
+Bug fixes:
+
+* Fix API to allow clients to upload one-time-keys with new sigs (PR #2206)
+
+
 Changes in synapse v0.21.0-rc2 (2017-05-08)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index d4ad23fa3d..c39dde913f 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.21.0-rc2"
+__version__ = "0.21.0-rc3"

From c6f4ff147509768b88860806501dac84cfc62d12 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 17 May 2017 11:29:14 +0100
Subject: [PATCH 2/3] Spelling

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

diff --git a/CHANGES.rst b/CHANGES.rst
index b6068ba995..65880dac5b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -3,7 +3,7 @@ Changes in synapse v0.21.0-rc3 (2017-05-17)
 
 Features:
 
-* Add per user ratelimiting overrides (PR #2208)
+* Add per user rate-limiting overrides (PR #2208)
 * Add config option to limit maximum number of events requested by ``/sync``
   and ``/messages`` (PR #2221) Thanks to @psaavedra!
 
@@ -13,7 +13,7 @@ Changes:
 * Various small performance fixes (PR #2201, #2202, #2224, #2226, #2227, #2228)
 * Update username availability checker API (PR #2209, #2213)
 * When purging, don't de-delta state groups we're about to delete (PR #2214)
-* Documantation to chek synapse version (PR #2215) Thanks to @hamber-dick!
+* Documentation to check synapse version (PR #2215) Thanks to @hamber-dick!
 * Add an index to event_search to speed up purge history API (PR #2218)
 
 

From 7c53a2780161478599f8394f6bb471f96fa87347 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 17 May 2017 13:13:45 +0100
Subject: [PATCH 3/3] Update changelog

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 65880dac5b..476d6fb6b4 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,7 +10,8 @@ Features:
 
 Changes:
 
-* Various small performance fixes (PR #2201, #2202, #2224, #2226, #2227, #2228)
+* Various small performance fixes (PR #2201, #2202, #2224, #2226, #2227, #2228,
+  #2229)
 * Update username availability checker API (PR #2209, #2213)
 * When purging, don't de-delta state groups we're about to delete (PR #2214)
 * Documentation to check synapse version (PR #2215) Thanks to @hamber-dick!