merge espie's recent changes to do with PERMIT_* and REGRESS_*
Merge branch 'master' of github.com:jasperla/openbsd-wip