Merge r294048: fix OpenSSH client information leak.
Security: SA-16:07.openssh Security: CVE-2016-0777