Bugfix and smarter dht hole plugging to speed up bootstrapping
Merge branch 'nospam' into testing