See review in https://github.com/tendermint/tendermint/pull/1292 - [x] Document the new functionality in the p2p spec (especially https://github.com/tendermint/tendermint/pull/1292#discussion_r173665125) - [x] Add TODO in test (needs control over time - https://github.com/tendermint/tendermint/pull/1292#commitcomment-28038530) - [x] consolidate the 2 "max retries" mechanisms (https://github.com/tendermint/tendermint/pull/1292#discussion_r173665070)