commit 140df63e1f07d25dafd64d3d6000dc0fe27edcf1
author Damien Miller <djm@mindrot.org> Wed Jun 20 21:46:57 2012 +1000
committer Damien Miller <djm@mindrot.org> Wed Jun 20 21:46:57 2012 +1000
tree 51e95453092e1453c1c01b961e7ed84466290394
parent efc6fc995d894458493699e7e1becdb06edb3f83

   - 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

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 67daa54..76c6e92 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,14 @@
      [mux.c]
      fix bz#1948: ssh -f doesn't fork for multiplexed connection.
      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
 
 20120519
  - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct.  Patch