p2p handling of inv for blocks and transactions
Merge remote-tracking branch 'bitpay/master' into feature/prototype-p2p
Merge pull request #5 from maraoz/feature/prototype-p2p

p2p handling of inv for blocks and transactions