From 462b755a603e7f069f2b34ca7b46918470d6a8f4 Mon Sep 17 00:00:00 2001
From: Ethan Buchman <ethan@coinculture.info>
Date: Mon, 11 Dec 2017 14:37:57 -0500
Subject: [PATCH 1/2] activate PEX reactor by default

---
 cmd/tendermint/commands/run_node.go | 2 +-
 config/config.go                    | 1 +
 p2p/pex_reactor.go                  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cmd/tendermint/commands/run_node.go b/cmd/tendermint/commands/run_node.go
index c71b4783f..0f37bb319 100644
--- a/cmd/tendermint/commands/run_node.go
+++ b/cmd/tendermint/commands/run_node.go
@@ -30,7 +30,7 @@ func AddNodeFlags(cmd *cobra.Command) {
 	cmd.Flags().String("p2p.laddr", config.P2P.ListenAddress, "Node listen address. (0.0.0.0:0 means any interface, any port)")
 	cmd.Flags().String("p2p.seeds", config.P2P.Seeds, "Comma delimited host:port seed nodes")
 	cmd.Flags().Bool("p2p.skip_upnp", config.P2P.SkipUPNP, "Skip UPNP configuration")
-	cmd.Flags().Bool("p2p.pex", config.P2P.PexReactor, "Enable Peer-Exchange (dev feature)")
+	cmd.Flags().Bool("p2p.pex", config.P2P.PexReactor, "Enable/disable Peer-Exchange")
 
 	// consensus flags
 	cmd.Flags().Bool("consensus.create_empty_blocks", config.Consensus.CreateEmptyBlocks, "Set this to false to only produce blocks when there are txs or when the AppHash changes")
diff --git a/config/config.go b/config/config.go
index 783758896..7f779d9a2 100644
--- a/config/config.go
+++ b/config/config.go
@@ -244,6 +244,7 @@ func DefaultP2PConfig() *P2PConfig {
 		MaxMsgPacketPayloadSize: 1024,   // 1 kB
 		SendRate:                512000, // 500 kB/s
 		RecvRate:                512000, // 500 kB/s
+		PexReactor:              true,
 	}
 }
 
diff --git a/p2p/pex_reactor.go b/p2p/pex_reactor.go
index 960c8c641..9f6a9490e 100644
--- a/p2p/pex_reactor.go
+++ b/p2p/pex_reactor.go
@@ -144,7 +144,7 @@ func (r *PEXReactor) Receive(chID byte, src Peer, msgBytes []byte) {
 		r.Logger.Error("Error decoding message", "err", err)
 		return
 	}
-	r.Logger.Info("Received message", "msg", msg)
+	r.Logger.Debug("Received message", "src", src, "chId", chID, "msg", msg)
 
 	switch msg := msg.(type) {
 	case *pexRequestMessage:

From 2f91289880f30e260ef30e2a0eac23e08fcc91a7 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Wed, 13 Dec 2017 12:25:34 -0600
Subject: [PATCH 2/2] update changelog [ci skip]

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55b2f951a..f9f0809d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,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.15.0 (TBD)
+
+BREAKING CHANGES:
+- [p2p] enable the Peer Exchange reactor by default
+- [types] add Timestamp field to Proposal/Vote
+
 ## 0.14.0 (December 11, 2017)
 
 BREAKING CHANGES: