fix smtpctl resume route
Merge branch 'master' into portable
print version when -h
Merge branch 'master' into portable
we inherit from parent and can't reload, no need for all that kludge
create listeners in the smtp process before dropping privileges rather
than in parent process then passing them through imsg
we don't need this anymore
Merge branch 'master' into portable

Conflicts:
	smtpd/smtpd.c