1 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 67ce8f8df..e4ec748f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,10 @@
      [sshd.8]
      add /etc/motd and $HOME/.hushlogin to FILES;
      from michael knudsen;
+   - djm@cvs.openbsd.org 2005/02/28 00:54:10
+     [ssh_config.5]
+     bz#849: document timeout on untrusted x11 forwarding sessions. Reported by
+     orion AT cora.nwra.com; ok markus@
 
 20050226
  - (dtucker) [openbsd-compat/bsd-openpty.c openbsd-compat/inet_ntop.c]
@@ -2191,4 +2195,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3670 2005/03/01 10:17:09 djm Exp $
+$Id: ChangeLog,v 1.3671 2005/03/01 10:17:31 djm Exp $