Refactored client/friend helper functions (down to line 274)
Refactored DHT.c down to line 367
Refactored DHT.c down to line 567
Refactored DHT.c down to line 779
Refactored DHT.c down to line 881
Refactored DHT.c down to line 1048 (beginning of NAT)
Refactored DHT.c, all of NAT punching functions (line 1217
Refactored DHT.c from end of NAT punching to EOF
Update commands.rst
DHT: Fix return value of time().

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
Merge pull request #263 from theshadowfog/patch-7

Update commands.rst
Merge branch 'master' into Jeffail-master

Conflicts:
	core/DHT.c
Update README.md

Added link to commands.rst
cmake: Rewrite FindSODIUM.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
removed getnumfriends()
Merge branch 'master' into Jeffail-master
Merge pull request #266 from CharmlessCoin/core

Removed getnumfriends()
Merge pull request #265 from theshadowfog/patch-4

Update README.md
Merge branch 'master' into Jeffail-master