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