Matthew Dillon slipped the stable tag again, to get a few more bugfixes in.

He also discovered some problems with the OpenBSD version of NTPd currently in base; it will probably be replaced or significantly changed at some point after this upcoming release.