summaryrefslogtreecommitdiff
path: root/crypto/external/bsd/openssh/dist/ssh_config.5
AgeCommit message (Expand)Author
2022-10-05merge conflicts between 9.0 and 9.1christos
2022-04-15merge conflicts between OpenSSH-8.9 and OpenSSH-9.0christos
2022-02-23Merge differences between openssh-8.8 and openssh-8.9christos
2021-09-27Merge conflicts between OpenSSH 8.7 and 8.8christos
2021-09-02Merge our changes from OpenSSH-8.6 to OpenSSH-8.7christos
2021-04-19Merge local changes between 8.5 and 8.6christos
2021-03-05merge local changes between openssh 8.4 and 8.5christos
2020-12-04Merge conflictschristos
2020-05-28Merge conflictschristos
2020-02-27Merge conflictschristos
2019-10-12merge openssh-8.1christos
2019-04-20merge conflicts.christos
2018-08-26merge conflictschristos
2018-04-06merge conflictschristos
2017-10-07merge conflicts.christos
2017-04-18merge conflictschristos
2016-12-25merge conflictschristos
2016-08-02merge conflicts.christos
2016-03-11merge conflictschristos
2015-08-21merge conflictschristos
2015-08-13merge conflictschristos
2015-07-03merge conflictschristos
2015-04-03Merge conflictschristos
2014-10-19merge openssh-6.7christos
2013-11-08merge conflicts.christos
2013-03-29welcome to openssh-6.2christos
2012-12-12update to 6.1christos
2012-05-02merge OpenSSH 6.0christos
2011-09-07merge openssh-5.9christos
2011-07-25- Merge conflictschristos
2010-11-21Resolve conflictsadam
2010-04-29Fix date strings.wiz
2010-04-29Don't mention "umac-64@openssh.com" MAC algorithm which is not enabledtron
2009-06-07Merge in our changes:christos
2009-06-07import 5.2 from ftp.openbsd.orgchristos