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