Apply patch openssh6.5-server-logging.diff to branch hpn-server-logging.
Merge branch 'hpn-server-logging' into hpn

* hpn-server-logging:
  Apply patch openssh6.5-server-logging.diff to branch hpn-server-logging.

Conflicts:
	kex.c