Merge branch 'dns-seed' of https://github.com/jgarzik/bitcoin