summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a68559b66..e3f68e504 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,6 +118,10 @@
118 - jmc@cvs.openbsd.org 2008/06/12 19:10:09 118 - jmc@cvs.openbsd.org 2008/06/12 19:10:09
119 [ssh_config.5 ssh-keygen.1] 119 [ssh_config.5 ssh-keygen.1]
120 tweak the ascii art text; ok grunk 120 tweak the ascii art text; ok grunk
121 - dtucker@cvs.openbsd.org 2008/06/12 20:38:28
122 [sshd.c sshconnect.c packet.h misc.c misc.h packet.c]
123 Make keepalive timeouts apply while waiting for a packet, particularly
124 during key renegotiation (bz #1363). With djm and Matt Day, ok djm@
121 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now 125 - (dtucker) [clientloop.c serverloop.c] channel_register_filter now
122 takes 2 more args. with djm@ 126 takes 2 more args. with djm@
123 127
@@ -4282,4 +4286,4 @@
4282 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4286 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4283 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4287 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4284 4288
4285$Id: ChangeLog,v 1.4987 2008/06/12 19:18:03 dtucker Exp $ 4289$Id: ChangeLog,v 1.4988 2008/06/12 20:42:45 dtucker Exp $