am 948acf71: Merge "Switch back to OpenBSD inet_ntop now they\'re FORTIFY clean."

* commit '948acf710ed9be223696288466d4f4a566169ec5':
  Switch back to OpenBSD inet_ntop now they're FORTIFY clean.