From 71da5e128a14508b997d6e4a4c7cd3460612bdb8 Mon Sep 17 00:00:00 2001
From: Zach Ramsay <zach.ramsay@gmail.com>
Date: Fri, 29 Jun 2018 09:56:15 -0400
Subject: [PATCH 1/3] fix url path because cloudfront

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index b3158c219..bafbec354 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -8,7 +8,7 @@ Welcome to Tendermint!
 
 This location for our documentation has been deprecated, please see:
 
-- https://tendermint.com/docs
+- https://tendermint.com/docs/
 
 The last version built by Read The Docs will still be available at:
 

From 087d3e54d2e0ee38599e8449249e694d58a383b2 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 3 Jul 2018 18:52:26 -0400
Subject: [PATCH 2/3] Update CHANGELOG.md

Emphasize that all integers are encoded as strings in the rpc
---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c9100157..0bfd839e5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,9 @@ BREAKING CHANGES:
     * `tmlibs/merkle` -> `crypto/merkle`. Uses SHA256 instead of RIPEMD160
 - [tmlibs] Update to v0.9.0 and merge into `libs`
     * remove `merkle` package (moved to `crypto/merkle`)
-- [rpc] `syncing` is now called `catching_up`.
+- [rpc] 
+    * All integers are encoded as strings (part of the update for Amino v0.10.1)
+    * `syncing` is now called `catching_up`
 
 FEATURES
 - [cmd] Added metrics (served under `/metrics` using a Prometheus client;

From 2fa99628351bd6d4ba14226bb7336135d655ff40 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Thu, 5 Jul 2018 12:03:23 -0400
Subject: [PATCH 3/3] changelog and version

---
 CHANGELOG.md       | 15 +++++++++++++--
 version/version.go |  6 +++---
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e910e365..b05b64ddf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,19 @@
 # Changelog
 
-## 0.23.0
+## 0.22.1
 
-*TBD*
+*July 5th, 2018*
+
+IMPROVEMENTS
+
+* Cleanup post repo-merge.
+* [docs] Various improvements.
+
+BUG FIXES
+
+* [state] Return error when EndBlock returns a 0-power validator that isn't
+  already in the validator set.
+* [consensus] Shut down WAL properly.
 
 ## 0.22.0
 
diff --git a/version/version.go b/version/version.go
index aac5dd587..68f1b4837 100644
--- a/version/version.go
+++ b/version/version.go
@@ -3,14 +3,14 @@ package version
 // Version components
 const (
 	Maj = "0"
-	Min = "23"
-	Fix = "0"
+	Min = "22"
+	Fix = "1"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.23.0-dev"
+	Version = "0.22.1"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string