Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/crypto/dist/ssh/Attic/ssh_config,v
retrieving revision 1.12
retrieving revision 1.12.8.1
diff -u -p -r1.12 -r1.12.8.1
--- src/crypto/dist/ssh/Attic/ssh_config	2006/09/28 21:22:15	1.12
+++ src/crypto/dist/ssh/Attic/ssh_config	2008/01/09 01:22:49	1.12.8.1
@@ -1,5 +1,5 @@
-#	$NetBSD: ssh_config,v 1.12 2006/09/28 21:22:15 christos Exp $
-#	$OpenBSD: ssh_config,v 1.22 2006/05/29 12:56:33 dtucker Exp $
+#	$NetBSD: ssh_config,v 1.12.8.1 2008/01/09 01:22:49 matt 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
@@ -39,6 +39,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