upstream commit

set ssh(1) protocol version to 2 only.

ok djm@

Upstream-ID: e168daf9d27d7e392e3c9923826bd8e87b2b3a10

ssh_config

@@ -1,4 +1,4 @@
-#	$OpenBSD: ssh_config,v 1.29 2016/02/20 23:02:39 sobrado Exp $
+#	$OpenBSD: ssh_config,v 1.30 2016/02/20 23:06:23 sobrado Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -37,7 +37,7 @@
 #   IdentityFile ~/.ssh/id_ecdsa
 #   IdentityFile ~/.ssh/id_ed25519
 #   Port 22
-#   Protocol 2,1
+#   Protocol 2
 #   Cipher 3des
 #   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
 #   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160