sync with openbsd-current