Fixed also sslstrip
Merge branch 'fix-errors' into fix-iconv

Conflicts:
	src/ec_sslwrap.c