upstream commit

tweak previous;
upstream commit

plug a memory leak; from Maxime Villard.

ok djm@
upstream commit

whitespace
upstream commit

whitespace
Merge remote-tracking branch 'upstream/master'
upstream commit

Remove unnecessary include: netinet/in_systm.h is not needed
 by these programs.

NB. skipped for portable

ok deraadt@ millert@
include version number in OpenSSL-too-old error
Prepare scripts for next Cygwin release

Makes the Cygwin-specific ssh-user-config script independent of the
existence of /etc/passwd.  The next Cygwin release will allow to
generate passwd and group entries from the Windows account DBs, so the
scripts have to adapt.

from Corinna Vinschen
upstream commit

mux-related manual tweaks

mention ControlPersist=0 is the same as ControlPersist=yes

recommend that ControlPath sockets be placed in a og-w directory
Merge remote-tracking branch 'upstream/master'