CVS commit: src/crypto/external/bsd/openssh/dist

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Aug 21 08:20:59 UTC 2015

Modified Files:
        src/crypto/external/bsd/openssh/dist: auth.c compat.c dns.c mux.c
            packet.c sftp-server.c sftp.c ssh-keygen.1 ssh-keygen.c
            ssh-pkcs11-helper.c ssh_config.5 sshconnect.c sshd.c sshd_config.5
            sshkey.c version.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/crypto/external/bsd/openssh/dist/auth.c \
    src/crypto/external/bsd/openssh/dist/ssh-keygen.1
cvs rdiff -u -r1.12 -r1.13 src/crypto/external/bsd/openssh/dist/compat.c \
    src/crypto/external/bsd/openssh/dist/mux.c \
    src/crypto/external/bsd/openssh/dist/sftp-server.c \
    src/crypto/external/bsd/openssh/dist/sshconnect.c
cvs rdiff -u -r1.11 -r1.12 src/crypto/external/bsd/openssh/dist/dns.c
cvs rdiff -u -r1.20 -r1.21 src/crypto/external/bsd/openssh/dist/packet.c
cvs rdiff -u -r1.15 -r1.16 src/crypto/external/bsd/openssh/dist/sftp.c \
    src/crypto/external/bsd/openssh/dist/ssh_config.5
cvs rdiff -u -r1.18 -r1.19 src/crypto/external/bsd/openssh/dist/ssh-keygen.c
cvs rdiff -u -r1.8 -r1.9 \
    src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c
cvs rdiff -u -r1.21 -r1.22 src/crypto/external/bsd/openssh/dist/sshd.c
cvs rdiff -u -r1.19 -r1.20 src/crypto/external/bsd/openssh/dist/sshd_config.5
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/sshkey.c
cvs rdiff -u -r1.16 -r1.17 src/crypto/external/bsd/openssh/dist/version.h

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