From ac58ce86e6f4dcb245d5e1aa28a5c7a9f4a56072 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Wed, 20 Jun 2012 21:50:47 +1000
Subject: [PATCH]    - djm@cvs.openbsd.org 2012/01/07 21:11:36      [mux.c]    
  fix double-free in new session handler      NB. Id sync only

---
 ChangeLog | 4 ++++
 mux.c     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 76c6e920f..419640c2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,10 @@
      > fix bz#1948: ssh -f doesn't fork for multiplexed connection.
      > ok dtucker@
      it interacts badly with ControlPersist
+   - djm@cvs.openbsd.org 2012/01/07 21:11:36
+     [mux.c]
+     fix double-free in new session handler
+     NB. Id sync only
 
 20120519
  - (dtucker) [configure.ac] bz#2010: fix non-portable shell construct.  Patch
diff --git a/mux.c b/mux.c
index 30b4f6f93..d90605eb4 100644
--- a/mux.c
+++ b/mux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mux.c,v 1.33 2011/12/04 23:16:12 djm Exp $ */
+/* $OpenBSD: mux.c,v 1.34 2012/01/07 21:11:36 djm Exp $ */
 /*
  * Copyright (c) 2002-2008 Damien Miller <djm@openbsd.org>
  *