From 2c553d735af483df88e556e2ff4ea5b69e682387 Mon Sep 17 00:00:00 2001
From: William Banfield <4561443+williambanfield@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:50:48 -0400
Subject: [PATCH] Update changelog for release v0.34.17 (#8239)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4fc13aa0..922728790 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 Friendly reminder, we have a [bug bounty program](https://hackerone.com/cosmos).
 
+## v0.34.17
+
+### BREAKING CHANGES
+
+- CLI/RPC/Config
+
+   - [cli] [\#8081](https://github.com/tendermint/tendermint/issues/8081) make the reset command safe to use (@marbar3778).
+
+### BUG FIXES
+
+- [consensus] [\#8079](https://github.com/tendermint/tendermint/issues/8079) start the timeout ticker before relay (backport #7844) (@creachadair).
+- [consensus] [\#7992](https://github.com/tendermint/tendermint/issues/7992) [\#7994](https://github.com/tendermint/tendermint/issues/7994) change lock handling in handleMsg and reactor to alleviate issues gossiping during long ABCI calls (@williambanfield).
+
 ## v0.34.16
 
 Special thanks to external contributors on this release: @yihuang
diff --git a/CHANGELOG_PENDING.md b/CHANGELOG_PENDING.md
index 83c5de6ee..1420b6911 100644
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -1,6 +1,6 @@
 # Unreleased Changes
 
-## v0.34.16
+## v0.34.18
 
 Special thanks to external contributors on this release:
 
@@ -10,8 +10,6 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi
 
 - CLI/RPC/Config
 
-   - [cli] \#8081 make the reset command safe to use (@marbar3778).
-
 - Apps
 
 - P2P Protocol
diff --git a/version/version.go b/version/version.go
index d51cd1918..f455f0535 100644
--- a/version/version.go
+++ b/version/version.go
@@ -7,7 +7,7 @@ var (
 const (
 	// TMVersionDefault is the used as the fallback version of Tendermint Core
 	// when not using git describe. It is formatted with semantic versioning.
-	TMVersionDefault = "0.34.16"
+	TMVersionDefault = "0.34.17"
 	// ABCISemVer is the semantic version of the ABCI library
 	ABCISemVer = "0.17.0"