proper libsodium version
Merge branch 'ProMcTagonist-patch-1'
Use libsodium 0.7.0+ (more thorough though)
Merge branch 'master' of https://github.com/dubslow/toxcore
Merge remote-tracking branch 'upstream/master'