do not escape user.directory expansion
Merge branch 'master' of ssh.poolp.org:/git/opensmtpd
Merge branch 'master' into portable