---
- branch: MAIN
  date: Fri Jul  3 01:00:00 UTC 2015
  files:
  - new: '1.1'
    old: '0'
    path: src/crypto/external/bsd/openssh/openssh2netbsd
    pathrev: src/crypto/external/bsd/openssh/openssh2netbsd@1.1
    type: added
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/PROTOCOL
    pathrev: src/crypto/external/bsd/openssh/dist/PROTOCOL@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/PROTOCOL.agent
    pathrev: src/crypto/external/bsd/openssh/dist/PROTOCOL.agent@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/dispatch.c
    pathrev: src/crypto/external/bsd/openssh/dist/dispatch.c@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/groupaccess.c
    pathrev: src/crypto/external/bsd/openssh/dist/groupaccess.c@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/krl.c
    pathrev: src/crypto/external/bsd/openssh/dist/krl.c@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/match.c
    pathrev: src/crypto/external/bsd/openssh/dist/match.c@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/match.h
    pathrev: src/crypto/external/bsd/openssh/dist/match.h@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/xmalloc.c
    pathrev: src/crypto/external/bsd/openssh/dist/xmalloc.c@1.6
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/crypto/external/bsd/openssh/dist/xmalloc.h
    pathrev: src/crypto/external/bsd/openssh/dist/xmalloc.h@1.6
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/crypto/external/bsd/openssh/dist/auth-options.c
    pathrev: src/crypto/external/bsd/openssh/dist/auth-options.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/crypto/external/bsd/openssh/dist/ssh-add.1
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-add.1@1.10
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssh/dist/auth-pam.c
    pathrev: src/crypto/external/bsd/openssh/dist/auth-pam.c@1.7
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssh/dist/compat.h
    pathrev: src/crypto/external/bsd/openssh/dist/compat.h@1.7
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssh/dist/dns.h
    pathrev: src/crypto/external/bsd/openssh/dist/dns.h@1.7
    type: modified
  - new: '1.7'
    old: '1.6'
    path: src/crypto/external/bsd/openssh/dist/kexgexc.c
    pathrev: src/crypto/external/bsd/openssh/dist/kexgexc.c@1.7
    type: modified
  - new: '1.13'
    old: '1.12'
    path: src/crypto/external/bsd/openssh/dist/auth.c
    pathrev: src/crypto/external/bsd/openssh/dist/auth.c@1.13
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/auth.h
    pathrev: src/crypto/external/bsd/openssh/dist/auth.h@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/authfile.c
    pathrev: src/crypto/external/bsd/openssh/dist/authfile.c@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/channels.h
    pathrev: src/crypto/external/bsd/openssh/dist/channels.h@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/compat.c
    pathrev: src/crypto/external/bsd/openssh/dist/compat.c@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/kex.c
    pathrev: src/crypto/external/bsd/openssh/dist/kex.c@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/misc.c
    pathrev: src/crypto/external/bsd/openssh/dist/misc.c@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/myproposal.h
    pathrev: src/crypto/external/bsd/openssh/dist/myproposal.h@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/crypto/external/bsd/openssh/dist/ssh-add.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-add.c@1.11
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/auth1.c
    pathrev: src/crypto/external/bsd/openssh/dist/auth1.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/auth2-pubkey.c
    pathrev: src/crypto/external/bsd/openssh/dist/auth2-pubkey.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/monitor_wrap.c
    pathrev: src/crypto/external/bsd/openssh/dist/monitor_wrap.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/mux.c
    pathrev: src/crypto/external/bsd/openssh/dist/mux.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/scp.c
    pathrev: src/crypto/external/bsd/openssh/dist/scp.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/servconf.h
    pathrev: src/crypto/external/bsd/openssh/dist/servconf.h@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/sftp-server.c
    pathrev: src/crypto/external/bsd/openssh/dist/sftp-server.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/crypto/external/bsd/openssh/dist/sshconnect.c
    pathrev: src/crypto/external/bsd/openssh/dist/sshconnect.c@1.12
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssh/dist/auth2-hostbased.c
    pathrev: src/crypto/external/bsd/openssh/dist/auth2-hostbased.c@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssh/dist/gss-serv.c
    pathrev: src/crypto/external/bsd/openssh/dist/gss-serv.c@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssh/dist/hostfile.c
    pathrev: src/crypto/external/bsd/openssh/dist/hostfile.c@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssh/dist/sftp-client.h
    pathrev: src/crypto/external/bsd/openssh/dist/sftp-client.h@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssh/dist/ssh-rsa.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-rsa.c@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/crypto/external/bsd/openssh/dist/uuencode.c
    pathrev: src/crypto/external/bsd/openssh/dist/uuencode.c@1.8
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/crypto/external/bsd/openssh/dist/authfd.c
    pathrev: src/crypto/external/bsd/openssh/dist/authfd.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/crypto/external/bsd/openssh/dist/dh.c
    pathrev: src/crypto/external/bsd/openssh/dist/dh.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/crypto/external/bsd/openssh/dist/kexgexs.c
    pathrev: src/crypto/external/bsd/openssh/dist/kexgexs.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/crypto/external/bsd/openssh/dist/monitor_wrap.h
    pathrev: src/crypto/external/bsd/openssh/dist/monitor_wrap.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/crypto/external/bsd/openssh/dist/ssh-agent.1
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-agent.1@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/crypto/external/bsd/openssh/dist/ssh-keysign.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-keysign.c@1.9
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/channels.c
    pathrev: src/crypto/external/bsd/openssh/dist/channels.c@1.14
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/clientloop.c
    pathrev: src/crypto/external/bsd/openssh/dist/clientloop.c@1.14
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/readconf.c
    pathrev: src/crypto/external/bsd/openssh/dist/readconf.c@1.14
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/sftp-client.c
    pathrev: src/crypto/external/bsd/openssh/dist/sftp-client.c@1.14
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/ssh-keyscan.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-keyscan.c@1.14
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/ssh_config.5
    pathrev: src/crypto/external/bsd/openssh/dist/ssh_config.5@1.14
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/sshd.8
    pathrev: src/crypto/external/bsd/openssh/dist/sshd.8@1.14
    type: modified
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/dist/sshd_config
    pathrev: src/crypto/external/bsd/openssh/dist/sshd_config@1.14
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/crypto/external/bsd/openssh/dist/dh.h
    pathrev: src/crypto/external/bsd/openssh/dist/dh.h@1.5
    type: modified
  - new: '1.5'
    old: '1.4'
    path: src/crypto/external/bsd/openssh/dist/uidswap.c
    pathrev: src/crypto/external/bsd/openssh/dist/uidswap.c@1.5
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssh/dist/digest-libc.c
    pathrev: src/crypto/external/bsd/openssh/dist/digest-libc.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssh/dist/hmac.c
    pathrev: src/crypto/external/bsd/openssh/dist/hmac.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssh/dist/kexc25519.c
    pathrev: src/crypto/external/bsd/openssh/dist/kexc25519.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssh/dist/kexc25519s.c
    pathrev: src/crypto/external/bsd/openssh/dist/kexc25519s.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssh/dist/sshbuf-misc.c
    pathrev: src/crypto/external/bsd/openssh/dist/sshbuf-misc.c@1.4
    type: modified
  - new: '1.4'
    old: '1.3'
    path: src/crypto/external/bsd/openssh/dist/sshkey.c
    pathrev: src/crypto/external/bsd/openssh/dist/sshkey.c@1.4
    type: modified
  - new: '1.15'
    old: '1.14'
    path: src/crypto/external/bsd/openssh/dist/monitor.c
    pathrev: src/crypto/external/bsd/openssh/dist/monitor.c@1.15
    type: modified
  - new: '1.15'
    old: '1.14'
    path: src/crypto/external/bsd/openssh/dist/session.c
    pathrev: src/crypto/external/bsd/openssh/dist/session.c@1.15
    type: modified
  - new: '1.15'
    old: '1.14'
    path: src/crypto/external/bsd/openssh/dist/ssh-agent.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-agent.c@1.15
    type: modified
  - new: '1.15'
    old: '1.14'
    path: src/crypto/external/bsd/openssh/dist/ssh.1
    pathrev: src/crypto/external/bsd/openssh/dist/ssh.1@1.15
    type: modified
  - new: '1.15'
    old: '1.14'
    path: src/crypto/external/bsd/openssh/dist/version.h
    pathrev: src/crypto/external/bsd/openssh/dist/version.h@1.15
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/crypto/external/bsd/openssh/dist/opacket.c
    pathrev: src/crypto/external/bsd/openssh/dist/opacket.c@1.3
    type: modified
  - new: '0'
    old: '1.6'
    path: src/crypto/external/bsd/openssh/dist/openssh2netbsd
    pathrev: src/crypto/external/bsd/openssh/dist/openssh2netbsd@0
    type: deleted
  - new: '1.19'
    old: '1.18'
    path: src/crypto/external/bsd/openssh/dist/packet.c
    pathrev: src/crypto/external/bsd/openssh/dist/packet.c@1.19
    type: modified
  - new: '1.19'
    old: '1.18'
    path: src/crypto/external/bsd/openssh/dist/sshd.c
    pathrev: src/crypto/external/bsd/openssh/dist/sshd.c@1.19
    type: modified
  - new: '1.18'
    old: '1.17'
    path: src/crypto/external/bsd/openssh/dist/servconf.c
    pathrev: src/crypto/external/bsd/openssh/dist/servconf.c@1.18
    type: modified
  - new: '1.18'
    old: '1.17'
    path: src/crypto/external/bsd/openssh/dist/sshd_config.5
    pathrev: src/crypto/external/bsd/openssh/dist/sshd_config.5@1.18
    type: modified
  - new: '1.17'
    old: '1.16'
    path: src/crypto/external/bsd/openssh/dist/ssh-keygen.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh-keygen.c@1.17
    type: modified
  - new: '1.17'
    old: '1.16'
    path: src/crypto/external/bsd/openssh/dist/ssh.c
    pathrev: src/crypto/external/bsd/openssh/dist/ssh.c@1.17
    type: modified
  - new: '1.20'
    old: '1.19'
    path: src/crypto/external/bsd/openssh/dist/sshconnect2.c
    pathrev: src/crypto/external/bsd/openssh/dist/sshconnect2.c@1.20
    type: modified
  - new: '0'
    old: 1.1.1.1
    path: src/crypto/external/bsd/openssh/dist/moduli-gen/moduli
    pathrev: src/crypto/external/bsd/openssh/dist/moduli-gen/moduli@0
    type: deleted
  - new: '0'
    old: 1.1.1.1
    path: src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.1024
    pathrev: src/crypto/external/bsd/openssh/dist/moduli-gen/moduli.1024@0
    type: deleted
  - new: '1.14'
    old: '1.13'
    path: src/crypto/external/bsd/openssh/lib/shlib_version
    pathrev: src/crypto/external/bsd/openssh/lib/shlib_version@1.14
    type: modified
  id: 20150703T010000Z.66a441334fc7d6be7b8da4eec2a0aa6ad0604821
  log: "merge conflicts\n"
  module: src
  subject: 'CVS commit: src/crypto/external/bsd/openssh'
  unixtime: '1435885200'
  user: christos