sync with openbsd-current
Merge branch 'master' into hellfish