Merge branch 'master' into develop

CHANGELOG.md

@@ -1,14 +1,12 @@
 # Changelog
 
-## 0.20.0
+## 0.19.7
 
 BREAKING:
 
 - [libs/pubsub] TagMap#Get returns a string value
 - [libs/pubsub] NewTagMap accepts a map of strings
 
-## 0.19.6
-
 FEATURES
 
 - [rpc] the RPC documentation is now published to https://tendermint.github.io/slate
@@ -19,6 +17,14 @@ IMPROVEMENTS:
   which is not dependant on external RPC load
 - [consensus/wal] do not look for height in older files if we've seen height - 1
 
+## 0.19.6
+
+*May 29th, 2018*
+
+BUG FIXES
+
+- [blockchain] Fix fast-sync deadlock during high peer turnover
+
 ## 0.19.5
 
 *May 20th, 2018*

version/version.go

@@ -4,13 +4,13 @@ package version
 const (
 	Maj = "0"
 	Min = "19"
-	Fix = "6"
+	Fix = "7"
 )
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.19.6-dev"
+	Version = "0.19.7-dev"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string