diff options
| author | Matthew Vernon <mcv21@cam.ac.uk> | 2014-03-26 15:40:41 +0000 |
|---|---|---|
| committer | Matthew Vernon <mcv21@cam.ac.uk> | 2014-03-26 15:51:46 +0000 |
| commit | 0789c0d760ff7a61156a5d567e9f8b9f8195ff6e (patch) | |
| tree | ddb6377e86eb122c15c9fdcb67bed56c23cf028f /debian/changelog | |
| parent | c0c05f0952597c4c821c6cc658f029f5bfd6c68c (diff) | |
| parent | 63d5fa28e16d96db6bac2dbe3fcecb65328f8966 (diff) | |
merge patched into master
Diffstat (limited to 'debian/changelog')
| -rw-r--r-- | debian/changelog | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index d92aac4a7..017f5bb0e 100644 --- a/debian/changelog +++ b/debian/changelog | |||
| @@ -11,7 +11,8 @@ openssh (1:6.6p1-1) UNRELEASED; urgency=medium | |||
| 11 | 11 | ||
| 12 | [ Matthew Vernon ] | 12 | [ Matthew Vernon ] |
| 13 | * Fix failure to check SSHFP records if server presents a certificate | 13 | * Fix failure to check SSHFP records if server presents a certificate |
| 14 | (bug reported by me, patch largely by Mark Wooding) (Closes: #742513) | 14 | (bug reported by me, patch by upstream's Damien Miller; thanks also to |
| 15 | Mark Wooding for his help in fixing this) (Closes: #742513) | ||
| 15 | 16 | ||
| 16 | -- Colin Watson <cjwatson@debian.org> Thu, 20 Mar 2014 00:32:46 +0000 | 17 | -- Colin Watson <cjwatson@debian.org> Thu, 20 Mar 2014 00:32:46 +0000 |
| 17 | 18 | ||