From f0e4bac64e8a4eff8132afcfc8406ce5fac11369 Mon Sep 17 00:00:00 2001
From: Matthew <matthew@matrix.org>
Date: Sat, 7 Jan 2017 03:45:38 +0000
Subject: [PATCH] bump changelog & version

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

diff --git a/CHANGES.rst b/CHANGES.rst
index da42327903..3fb3197ace 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+Changes in synapse v0.18.7-rc2 (2017-01-07)
+===========================================
+
+Bug fixes:
+
+* Fix error in rc1's discarding invalid inbound traffic logic that was
+  incorrectly discarding missing events
+
 Changes in synapse v0.18.7-rc1 (2017-01-06)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 91e3a2c2e0..cb332279df 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.18.7-rc1"
+__version__ = "0.18.7-rc2"