am 9ff95c47: am 99e2a2f0: Merge "Switch to upstream OpenBSD mktemp.c."

* commit '9ff95c4763bcbc44d25092510fde299f0ba0be7f':
  Switch to upstream OpenBSD mktemp.c.