merged OpenSSH 4.7p1 to trunk

[gssapi-openssh.git] / openssh / ssh_config

diff --git a/openssh/ssh_config b/openssh/ssh_config
index 723fbe911b44f02f0b07b10df88e8c5e7bf3719f..873acdfc793320f2356f8e1c8bbbc4da33d51306 100644 (file)
--- a/openssh/ssh_config
+++ b/openssh/ssh_config
@@ -1,4 +1,4 @@
-#      $OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
+#      $OpenBSD: ssh_config,v 1.23 2007/06/08 04:40:40 pvalchev Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -40,6 +40,7 @@
 #   Protocol 2,1
 #   Cipher 3des
 #   Ciphers aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour,aes192-cbc,aes256-cbc
+#   MACs hmac-md5,hmac-sha1,umac-64@openssh.com,hmac-ripemd160
 #   EscapeChar ~
 #   Tunnel no
 #   TunnelDevice any:any