From 65a3dfe235b69fbba58f798a7d6522cd6f1244b1 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 3 Jun 2019 11:34:21 -0400
Subject: [PATCH] changelog and version (#3709)

---
 CHANGELOG.md         | 15 +++++++++++++++
 CHANGELOG_PENDING.md |  4 +---
 version/version.go   |  2 +-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4328d4b627..068d99c3cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## v0.31.7
+
+*June 3, 2019*
+
+This releases fixes a regression in the mempool introduced in v0.31.6.
+The regression caused the invalid committed txs to be proposed in blocks over and
+over again.
+
+### BUG FIXES:
+- [mempool] \#3699 Remove all committed txs from the mempool.
+    This reverts the change from v0.31.6 where we only remove valid txs from the mempool.
+    Note this means malicious proposals can cause txs to be dropped from the
+    mempools of other nodes by including them in blocks before they are valid.
+    See \#3322.
+
 ## v0.31.6
 
 *May 31st, 2019*
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 4e83c2dbb3..f211a27f39 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -1,4 +1,4 @@
-## v0.31.7
+## v0.31.8
 
 **
 
@@ -19,5 +19,3 @@
 ### IMPROVEMENTS:
 
 ### BUG FIXES:
-- [mempool] \#3699 Revert the change where we only remove valid transactions
-  from the mempool once a block is committed.
diff --git a/version/version.go b/version/version.go
index a7559d4995..1a15717f73 100644
--- a/version/version.go
+++ b/version/version.go
@@ -20,7 +20,7 @@ const (
 	// Must be a string because scripts like dist.sh read this file.
 	// XXX: Don't change the name of this variable or you will break
 	// automation :)
-	TMCoreSemVer = "0.31.5"
+	TMCoreSemVer = "0.31.7"
 
 	// ABCISemVer is the semantic version of the ABCI library
 	ABCISemVer  = "0.16.0"