sshd: merge upstream changes
dev: vimdiff