From e1d98bb7f6df3cda53701da12df08dc9d2be8914 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 27 Mar 2018 10:06:30 -0400
Subject: [PATCH 1/2] forgot bug fix in changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02f032c4c..0edc598a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -49,6 +49,9 @@ FEATURES:
 - [config] added the `--p2p.private_peer_ids` flag and `PrivatePeerIDs` config variable (see config for description)
 - [rpc] added `/health` endpoint, which returns empty result for now
 
+BUG FIXES:
+- [consensus] fix liveness bug by introducing ValidBlock mechanism
+
 ## 0.16.0 (February 20th, 2018)
 
 BREAKING CHANGES:

From 9bf5862def3e4f7b5a5e2fd155d2960346ff48ae Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Tue, 27 Mar 2018 11:20:09 -0400
Subject: [PATCH 2/2] types: fix genesis.AppStateJSON

---
 CHANGELOG.md       | 10 ++++++++--
 types/genesis.go   |  4 ++--
 version/version.go |  4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0edc598a3..aea9b5450 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,12 @@ BUG FIXES:
 - Graceful handling/recovery for apps that have non-determinism or fail to halt
 - Graceful handling/recovery for violations of safety, or liveness
 
+## 0.17.1 (March 27th, 2018)
+
+BUG FIXES:
+
+- [types] Actually support `app_state` in genesis as `AppStateJSON`
+
 ## 0.17.0 (March 27th, 2018)
 
 BREAKING:
@@ -32,7 +38,6 @@ BREAKING:
 
 IMPROVEMENTS:
 - [all] renamed `dummy` (`persistent_dummy`) to `kvstore` (`persistent_kvstore`) (name "dummy" is deprecated and will not work in the next breaking release)
-- [config] exposed `auth_enc` flag to enable/disable encryption
 - [docs] note on determinism (docs/determinism.rst)
 - [genesis] `app_options` field is deprecated. please rename it to `app_state` in your genesis file(s). `app_options` will not work in the next breaking release
 - [p2p] dial seeds directly without potential peers
@@ -43,11 +48,12 @@ IMPROVEMENTS:
 - [spec] various improvements
 - switched from glide to dep internally for package management
 - [wire] prep work for upgrading to new go-wire (which is now called go-amino)
-- [types/priv_validator] new format and socket client, allowing for remote signing
 
 FEATURES:
+- [config] exposed `auth_enc` flag to enable/disable encryption
 - [config] added the `--p2p.private_peer_ids` flag and `PrivatePeerIDs` config variable (see config for description)
 - [rpc] added `/health` endpoint, which returns empty result for now
+- [types/priv_validator] new format and socket client, allowing for remote signing
 
 BUG FIXES:
 - [consensus] fix liveness bug by introducing ValidBlock mechanism
diff --git a/types/genesis.go b/types/genesis.go
index a760caff9..8d885db97 100644
--- a/types/genesis.go
+++ b/types/genesis.go
@@ -28,7 +28,7 @@ type GenesisDoc struct {
 	ConsensusParams *ConsensusParams   `json:"consensus_params,omitempty"`
 	Validators      []GenesisValidator `json:"validators"`
 	AppHash         cmn.HexBytes       `json:"app_hash"`
-	_AppState       json.RawMessage    `json:"app_state,omitempty"`
+	AppStateJSON    json.RawMessage    `json:"app_state,omitempty"`
 	AppOptions      json.RawMessage    `json:"app_options,omitempty"` // DEPRECATED
 }
 
@@ -38,7 +38,7 @@ func (genDoc *GenesisDoc) AppState() json.RawMessage {
 	if len(genDoc.AppOptions) > 0 {
 		return genDoc.AppOptions
 	} else {
-		return genDoc._AppState
+		return genDoc.AppStateJSON
 	}
 }
 
diff --git a/version/version.go b/version/version.go
index 2b81e95cc..74662b808 100644
--- a/version/version.go
+++ b/version/version.go
@@ -2,12 +2,12 @@ package version
 
 const Maj = "0"
 const Min = "17"
-const Fix = "0"
+const Fix = "1"
 
 var (
 	// Version is the current version of Tendermint
 	// Must be a string because scripts like dist.sh read this file.
-	Version = "0.17.0"
+	Version = "0.17.1"
 
 	// GitCommit is the current HEAD set using ldflags.
 	GitCommit string