Merge branch 'master' into develop

CHANGELOG.md

@@ -51,6 +51,11 @@ BUG FIXES:
 - consensus: fix panic where prs.ProposalBlockParts is not initialized
 - p2p: fix panic on bad channel
 
+## 0.12.1 (November 27, 2017)
+
+BUG FIXES:
+- upgrade tmlibs dependency to enable Windows builds for Tendermint
+
 ## 0.12.0 (October 27, 2017)
 
 BREAKING CHANGES:

CONTRIBUTING.md

@@ -86,3 +86,15 @@ especially `go-p2p` and `go-rpc`, as their versions are referenced in tendermint
 - push to release-vX.X.X to run the extended integration tests on the CI
 - merge to master
 - merge master back to develop
+
+### Hotfix Procedure:
+- start on `master`
+- checkout a new branch named hotfix-vX.X.X
+- make the required changes
+  - these changes should be small and an absolute necessity
+  - add a note to CHANGELOG.md
+- bumb versions
+- push to hotfix-vX.X.X to run the extended integration tests on the CI
+- merge hotfix-vX.X.X to master
+- merge hotfix-vX.X.X to develop
+- delete the hotfix-vX.X.X branch

glide.lock

@@ -123,7 +123,7 @@ imports:
   subpackages:
   - iavl
 - name: github.com/tendermint/tmlibs
-  version: d9525c0fb671204450b160807480e1263053fb20
+  version: b854baa1fce7101c90b1d301b3359bb412f981c0
   subpackages:
   - autofile
   - cli

glide.yaml

@@ -34,7 +34,7 @@ import:
   subpackages:
   - iavl
 - package: github.com/tendermint/tmlibs
-  version: ~0.4.0
+  version: ~0.4.1
   subpackages:
   - autofile
   - cli

version/version.go

@@ -2,11 +2,11 @@ package version
 
 const Maj = "0"
 const Min = "12"
-const Fix = "0"
+const Fix = "1"
 
 var (
 	// The full version string
-	Version = "0.12.0"
+	Version = "0.12.1"
 
 	// GitCommit is set with --ldflags "-X main.gitCommit=$(git rev-parse HEAD)"
 	GitCommit string