Merge branch 'master' of https://github.com/poolpOrg/OpenSMTPD

Conflicts:
	smtpd/smtpctl.8
Merge branch 'master' into portable
formating
New envelope upgrade strategy: do the upgrade on the dictionnary
itself which makes incremental upgrade simpler.
Merge branch 'master' into portable

Conflicts:
	smtpd/util.c
Merge branch 'portable' of https://github.com/poolpOrg/OpenSMTPD into portable
Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portable
fix on FreeBSD