[openssh-commits] [openssh] 09/19: upstream commit

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit 1a1b24f8229bf7a21f89df21987433283265527a
Author: jmc at openbsd.org <jmc at openbsd.org>
Date:   Wed May 3 10:01:44 2017 +0000

    upstream commit
    
    more protocol 1 bits removed; ok djm
    
    Upstream-ID: b5b977eaf756915acb56aef3604a650e27f7c2b9
---
 ssh_config | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ssh_config b/ssh_config
index b986d52c..515513c3 100644
--- a/ssh_config
+++ b/ssh_config
@@ -1,4 +1,4 @@
-#	$OpenBSD: ssh_config,v 1.31 2017/04/30 23:18:22 djm Exp $
+#	$OpenBSD: ssh_config,v 1.32 2017/05/03 10:01:44 jmc Exp $
 
 # This is the ssh client system-wide configuration file.  See
 # ssh_config(5) for more information.  This file provides defaults for
@@ -29,14 +29,12 @@
 #   AddressFamily any
 #   ConnectTimeout 0
 #   StrictHostKeyChecking ask
-#   IdentityFile ~/.ssh/identity
 #   IdentityFile ~/.ssh/id_rsa
 #   IdentityFile ~/.ssh/id_dsa
 #   IdentityFile ~/.ssh/id_ecdsa
 #   IdentityFile ~/.ssh/id_ed25519
 #   Port 22
 #   Protocol 2
-#   Cipher 3des
 #   Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,3des-cbc
 #   MACs hmac-md5,hmac-sha1,umac-64 at openssh.com,hmac-ripemd160
 #   EscapeChar ~

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.