tree 6728c6ba0f07509e1bc9608fbc332de842b4b74a
parent 38778e3b6c89689bbdd01f4a52ac88f02bf59783
author Elliott Hughes <enh@google.com> 1405362179 -0700
committer Elliott Hughes <enh@google.com> 1405371543 -0700

Sync upstream-openbsd.

(cherry picked from commit 4f0b67a8dbf0e1d8b1dae42358553fb8d14456d4)

Change-Id: I8753959853312ab978bc4eb1bbbcdc7d1b007b95