Added encrypted save to toxcore, if sodium is used
Note, this is untested
Merge branch 'master' into encrypted_data
Update tox.c
fix travis sodium version
Merge branch 'encrypted_data' of https://github.com/dubslow/toxcore into encrypted_data
Merge branch 'master' into encrypted_data
compiling against nacl seems to break VANILLA_NACL...
Merge branch 'master' into encrypted_data
modify inclusions
nacl compiles! still needs testing though.
Add magic number, auto tests still required
testing works, but doesn't pass...
memzero() segfaulted for unknown reasons... probably pebkac...
encrypted save fully work with both libsodium and nacl
they both reliably pass "make check"
sigh... forgot to add very necessary files...
Increased maximum number of incomming TCP connections in TCP server.
Merge branch 'encrypted_data' of https://github.com/dubslow/toxcore
Properly ported a toxencryptsave function to NaCl.

removed now useless files.
Merge remote-tracking branch 'upstream/master'