update Makefile with ztree.o
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fixed incorrect method names
Merge remote-tracking branch 'upstream/master'
Bumped library version to 2:0:1

Revision 2, age is 1 since you can relink without recompiling old
code, in theory at least.
Reload certstore slightly better (not yet perfect)
Merge pull request #240 from hintjens/master

Updated library ABI version
Add explicit casts for MSVC compilation
Add missing headers/implementations to msvc11 project
Zchunk - cast to byte* and remove aligned (need windows equivalent)
Prelude - define sleep as Sleep for MSVC
define S_IRUSR as _S_IREAD for MSVC

cannot pass zfile selftest after this change. no good, but it lets me
compile for now.
Was not building properly without libsodium installed
Merge pull request #241 from hintjens/master

Was not building properly without libsodium installed
Merge pull request #242 from mattconnolly/master

Allow libsodium to be installed in a custom path and fix for SmartOS/Solaris build
fix out of tree build
Merge pull request #243 from TTimo/master

fix out of tree build
Ensure zctx_destroy ignores NULL zockets, instead of asserting and failing