Merge branch 'master' into fix-macosx
Merge https://github.com/fix-macosx/sslsplit

Conflicts:
	GNUmakefile
	main.c