Merge pull request #688 from nurupo/dht_bootstrap_daemon

Improved DHT bootstrap daemon
Fixed spelling
Merge pull request #689 from nurupo/dht_bootstrap_daemon

Fixed spelling
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into dht_bootstrap_daemon
Fixed function conflict