Merge branch 'pre-0.64'

author Simon Tatham <anakin@pobox.com>

Sat, 28 Feb 2015 07:57:58 +0000 (07:57 +0000)

committer Simon Tatham <anakin@pobox.com>

Sat, 28 Feb 2015 07:57:58 +0000 (07:57 +0000)
author Simon Tatham <anakin@pobox.com>
Sat, 28 Feb 2015 07:57:58 +0000 (07:57 +0000)
committer Simon Tatham <anakin@pobox.com>
Sat, 28 Feb 2015 07:57:58 +0000 (07:57 +0000)
diff --cc ssh.c
Simple merge
diff --cc ssh.h
Simple merge
diff --cc sshpubk.c
Simple merge
author	Simon Tatham <anakin@pobox.com>
	Sat, 28 Feb 2015 07:57:58 +0000 (07:57 +0000)
committer	Simon Tatham <anakin@pobox.com>
	Sat, 28 Feb 2015 07:57:58 +0000 (07:57 +0000)
		1	2
ssh.c	patch \|	diff1 \|	diff2 \|	blob \| history
ssh.h	patch \|	diff1 \|	diff2 \|	blob \| history
sshpubk.c	patch \|	diff1 \|	diff2 \|	blob \| history