update Makefile
tune timeout
refine timeout
fix #187
refine log
update URLs
fix issue of SystemFunction036 not found at advapi32 when build libsodium .
bump version
update configure
Merge commit 'cd6a5e409d2d53677c4f121c0307c22ee7b907b2'

Conflicts:
	src/local.c
	src/redir.c
	src/server.c
	src/tunnel.c