From 0ec599d634d955d95f54ba0143c2457c48c3eb2c Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 25 Jun 2018 16:03:17 -0400
Subject: [PATCH] update to tendermint v0.21.0

---
 CHANGELOG.md       | 11 +++++++++++
 Gopkg.lock         | 21 +++++++++++----------
 Gopkg.toml         |  6 +++---
 version/version.go |  4 ++--
 4 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4428f7a4c8..e3de08a742 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog
 
+## 0.19.1
+
+*June 25, 2018*
+
+* Update to Tendermint v0.21.0 (fixes websocket memory leak and a few other
+  things)
+
+BREAKING CHANGES:
+* Changes the default ports from `4665X` to `2665X`
+
+
 ## 0.19.0
 
 *June 13, 2018*
diff --git a/Gopkg.lock b/Gopkg.lock
index 07a3c6d5b9..7a04f9c095 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -256,7 +256,7 @@
     "leveldb/table",
     "leveldb/util"
   ]
-  revision = "e2150783cd35f5b607daca48afd8c57ec54cc995"
+  revision = "0d5a0ceb10cf9ab89fdd744cc8c50a83134f6697"
 
 [[projects]]
   name = "github.com/tendermint/abci"
@@ -267,8 +267,8 @@
     "server",
     "types"
   ]
-  revision = "ebee2fe114020aa49c70bbbae50b7079fc7e7b90"
-  version = "v0.11.0"
+  revision = "198dccf0ddfd1bb176f87657e3286a05a6ed9540"
+  version = "v0.12.0"
 
 [[projects]]
   branch = "master"
@@ -347,8 +347,8 @@
     "types",
     "version"
   ]
-  revision = "27bd1deabe4ba6a2d9b463b8f3e3f1e31b993e61"
-  version = "v0.20.0"
+  revision = "46369a1ab76f274ab47179c4176221842b8207b4"
+  version = "v0.21.0"
 
 [[projects]]
   branch = "develop"
@@ -366,7 +366,7 @@
     "merkle",
     "merkle/tmhash"
   ]
-  revision = "0c98d10b4ffbd87978d79c160e835b3d3df241ec"
+  revision = "56f44670ebd5a4e99e55f3f7d6f4d360ef5f1973"
 
 [[projects]]
   branch = "master"
@@ -374,6 +374,7 @@
   packages = [
     "blowfish",
     "curve25519",
+    "internal/subtle",
     "nacl/box",
     "nacl/secretbox",
     "openpgp/armor",
@@ -382,7 +383,7 @@
     "ripemd160",
     "salsa20/salsa"
   ]
-  revision = "8ac0e0d97ce45cd83d1d7243c060cb8461dda5e9"
+  revision = "a49355c7e3f8fe157a85be2f77e6e269a0f89602"
 
 [[projects]]
   branch = "master"
@@ -396,13 +397,13 @@
     "internal/timeseries",
     "trace"
   ]
-  revision = "db08ff08e8622530d9ed3a0e8ac279f6d4c02196"
+  revision = "afe8f62b1d6bbd81f31868121a50b06d8188e1f9"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sys"
   packages = ["unix"]
-  revision = "bff228c7b664c5fce602223a05fb708fd8654986"
+  revision = "a200a19cb90b19de298170992778b1fda7217bd6"
 
 [[projects]]
   name = "golang.org/x/text"
@@ -463,6 +464,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "31f69b235b2d8f879a215c9e8ca0919adc62d21f6830b17931a3a0efb058721f"
+  inputs-digest = "1b1b1e09e57cf232477c26f253890f97a94fab95bcfcd26c834db7b4fbbab45a"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index 77de1b78de..2c0d378ed9 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -54,7 +54,7 @@
 
 [[constraint]]
   name = "github.com/tendermint/abci"
-  version = "=0.11.0"
+  version = "=0.12.0"
 
 [[constraint]]
   name = "github.com/tendermint/go-crypto"
@@ -68,9 +68,9 @@
   name = "github.com/tendermint/iavl"
   version = "0.8.0-rc0"
 
-[[constraint]]
+[[override]]
   name = "github.com/tendermint/tendermint"
-  version = "=0.20.0"
+  version = "=0.21.0"
 
 [[override]]
   name = "github.com/tendermint/tmlibs"
diff --git a/version/version.go b/version/version.go
index e24ef62f18..cb866a001d 100644
--- a/version/version.go
+++ b/version/version.go
@@ -7,9 +7,9 @@ package version
 
 const Maj = "0"
 const Min = "19"
-const Fix = "0"
+const Fix = "1"
 
-const Version = "0.19.0"
+const Version = "0.19.1"
 
 // GitCommit set by build flags
 var GitCommit = ""