From owner-cvs-all  Sat Jun  3  0:31:51 2000
Delivered-To: cvs-all@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP
	id 824F337BB0E; Sat,  3 Jun 2000 00:31:44 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Received: (from kris@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id AAA68028;
	Sat, 3 Jun 2000 00:31:44 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Message-Id: <200006030731.AAA68028@freefall.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sat, 3 Jun 2000 00:31:44 -0700 (PDT)
To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject: cvs commit: src/crypto/openssh key.c readconf.c session.c ssh.1
         ssh.c
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

kris        2000/06/03 00:31:44 PDT

  Modified files:
    crypto/openssh       key.c readconf.c session.c ssh.1 ssh.c 
  Log:
  Bring vendor patches onto the main branch, and resolve conflicts.
  
  Revision  Changes    Path
  1.4       +12 -8     src/crypto/openssh/key.c
  1.6       +9 -3      src/crypto/openssh/readconf.c
  1.4       +32 -14    src/crypto/openssh/session.c
  1.10      +15 -6     src/crypto/openssh/ssh.1
  1.7       +8 -3      src/crypto/openssh/ssh.c



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message