- Merged OpenBSD CVS changes:

[openssh.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d44707a161c75dc4018d03b220041eae7757331f..9386369b2de7f8299def3041c8268647763f7f7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 19991216
  - Makefile changes for Solaris from Peter Kocks 
    <peter.kocks@baygate.com>
+ - Minor updates to docs
+ - Merged OpenBSD CVS changes:
+   - [authfd.c ssh-agent.c]
+     keysize warnings talk about identity files
+   - [packet.c]
+     "Connection closed by x.x.x.x": fatal() -> log()
 
 19991215
  - Integrated patchs from Juergen Keil <jk@tools.de>