removing unnecessary function pointer _isset variables
fixing minor memory leak of friendlist
Have toxic handle new no-spam values from friend request
Update prompt.c

Make id uppercase.
Merge pull request #460 from krisl/master

Have toxic handle new no-spam values from friend request
prefer param over static

Conflicts:
	testing/toxic/main.c
Merge branch 'master' of https://github.com/naxuroqa/ProjectTox-Core into pr
add header guard and includes to windows.h
remove externs in favor of includes
move windows functions to its own file
remove temporary callbacks from refactoring
Merge branch 'master' of https://github.com/mkfifo/ProjectTox-Core into pr
Merge branch 'remove_externs' of https://github.com/krisl/ProjectTox-Core into pr
Fixed small compile error on my end.
Merge branch 'patch-6' of https://github.com/Astonex/ProjectTox-Core into pr
Incorrect constants: s/BOXZERO/ZERO/
s/BOXZERO/ZERO/
Reduced redundant code, added new crypto test
Messenger fix from pr #461.
Merge pull request #464 from slvr/crypto-fix

Incorrect constants: s/BOXZERO/ZERO/