Merge branch 'master' into portable
Create the control socket early.  This ensures that no other smtpd
instance is running before other initialization happens.
Merge branch 'portable' of ssh.poolp.org:/git/opensmtpd into portable
Merge branch 'master' into portable

Conflicts:
	smtpd/smtpd.c
bzero strlen() instead of _PASSWORD_LEN
limit the number of deferred evpid on a hoststats
Merge branch 'master' into portable