1 files changed, 8 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index de12bbef0..3f0471d70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,14 @@
      fix bz#1934: newer OpenSSL versions will require HMAC_CTX_Init before
      HMAC_init (this change in policy seems insane to me)
      ok dtucker@
+   - djm@cvs.openbsd.org 2011/12/04 23:16:12
+     [mux.c]
+     revert:
+     > revision 1.32
+     > date: 2011/12/02 00:41:56;  author: djm;  state: Exp;  lines: +4 -1
+     > fix bz#1948: ssh -f doesn't fork for multiplexed connection.
+     > ok dtucker@
+     it interacts badly with ControlPersist
 
 20111125
  - OpenBSD CVS Sync