From 2cbefcfcd23d457cff742e4941cb705604d53ce5 Mon Sep 17 00:00:00 2001
From: Yawning Angel <yawning@torproject.org>
Date: Mon, 25 Jan 2016 12:16:15 +0000
Subject: Fix other instances of attempting to close `nil` on handshake
 failure.

Bug introduced in e52258edac55d82ff153755493d770bfbbc9a346, not in any
released version of obfs4proxy.
---
 transports/obfs2/obfs2.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'transports/obfs2')

diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go
index a926141..8fa6cb8 100644
--- a/transports/obfs2/obfs2.go
+++ b/transports/obfs2/obfs2.go
@@ -113,8 +113,9 @@ func (cf *obfs2ClientFactory) Dial(network, addr string, dialFn base.DialFunc, a
 	if err != nil {
 		return nil, err
 	}
+	dialConn := conn
 	if conn, err = newObfs2ClientConn(conn); err != nil {
-		conn.Close()
+		dialConn.Close()
 		return nil, err
 	}
 	return conn, nil
-- 
cgit v1.2.3