Merge branch 'addrman' of https://github.com/sipa/bitcoin