Merge ^/head r312720 through r312893.
[freebsd.git] / crypto / openssh / roaming.h