rebase on pull when updating the openbsd branch

this avoids inadvertent local merges