From 899259619241e118be99b88aebcb7ffc20c587c3 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Thu, 24 Jan 2019 19:17:53 +0400
Subject: [PATCH 1/3] update changelog

---
 CHANGELOG.md         | 35 +++++++++++++++++++++++++++++++++++
 CHANGELOG_PENDING.md |  2 --
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d79fb8670..567b8f44f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Changelog
 
+## v0.29.1
+
+*January 24, 2019*
+
+Special thanks to external contributors on this release:
+@infinytum, @gauthamzz
+
+This release contains two important fixes: one for p2p layer where we sometimes
+were not closing connections and one for consensus layer where consensus with
+no empty blocks (`create_empty_blocks = false`) could halt.
+
+Friendly reminder, we have a [bug bounty
+program](https://hackerone.com/tendermint).
+
+### BREAKING CHANGES:
+
+* CLI/RPC/Config
+
+* Apps
+
+* Go API
+
+* Blockchain Protocol
+
+* P2P Protocol
+
+### FEATURES:
+
+### IMPROVEMENTS:
+- [pex] [\#3037](https://github.com/tendermint/tendermint/issues/3037) Only log "Reached max attempts to dial" once
+
+### BUG FIXES:
+- [consensus] [\#3199](https://github.com/tendermint/tendermint/issues/3199) Fix consensus halt with no empty blocks from not resetting triggeredTimeoutCommit
+- [p2p] [\#2967](https://github.com/tendermint/tendermint/issues/2967) Fix file descriptor leak
+
 ## v0.29.0
 
 *January 21, 2019*
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 98acd282c..06b2ec52c 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -19,7 +19,5 @@ Special thanks to external contributors on this release:
 ### FEATURES:
 
 ### IMPROVEMENTS:
-- [pex] \#3037 only log "Reached max attempts to dial" once
 
 ### BUG FIXES:
-- [p2p] \#2967 Fix file descriptor leaks

From bb0a9b3d6d7059f40aa8201311e644b67514bab5 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Thu, 24 Jan 2019 19:18:32 +0400
Subject: [PATCH 2/3] bump version

---
 version/version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/version/version.go b/version/version.go
index 87d81c6f7..9d05afe64 100644
--- a/version/version.go
+++ b/version/version.go
@@ -18,7 +18,7 @@ const (
 	// TMCoreSemVer is the current version of Tendermint Core.
 	// It's the Semantic Version of the software.
 	// Must be a string because scripts like dist.sh read this file.
-	TMCoreSemVer = "0.29.0"
+	TMCoreSemVer = "0.29.1"
 
 	// ABCISemVer is the semantic version of the ABCI library
 	ABCISemVer  = "0.15.0"

From 90970d0ddc6c0a66e521a5be55f6d60870e8ecfa Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Thu, 24 Jan 2019 11:19:52 -0500
Subject: [PATCH 3/3] fix changelog

---
 CHANGELOG.md | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 567b8f44f..437b7970d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,22 +14,10 @@ no empty blocks (`create_empty_blocks = false`) could halt.
 Friendly reminder, we have a [bug bounty
 program](https://hackerone.com/tendermint).
 
-### BREAKING CHANGES:
-
-* CLI/RPC/Config
-
-* Apps
-
-* Go API
-
-* Blockchain Protocol
-
-* P2P Protocol
-
-### FEATURES:
-
 ### IMPROVEMENTS:
 - [pex] [\#3037](https://github.com/tendermint/tendermint/issues/3037) Only log "Reached max attempts to dial" once
+- [rpc] [\#3159](https://github.com/tendermint/tendermint/issues/3159) Expose
+  `triggered_timeout_commit` in the `/dump_consensus_state`
 
 ### BUG FIXES:
 - [consensus] [\#3199](https://github.com/tendermint/tendermint/issues/3199) Fix consensus halt with no empty blocks from not resetting triggeredTimeoutCommit