From 66a9f31ebf5dac97da572671745a5fdbfcfd3d22 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Wed, 9 Jan 2013 07:48:06 +0000
Subject: [PATCH] merged pex fix from RC_0_16

---
 ChangeLog      | 1 +
 src/ut_pex.cpp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b64785b81..939b7bb87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* improve peers exchanged over PEX
 	* fixed rare crash in ut_metadata extension
 	* fixed files checking issue
 	* added missing pop_alerts() to python bindings
diff --git a/src/ut_pex.cpp b/src/ut_pex.cpp
index cd563d7dc..4cf541685 100644
--- a/src/ut_pex.cpp
+++ b/src/ut_pex.cpp
@@ -78,6 +78,7 @@ namespace libtorrent { namespace
 		if (!p.is_outgoing() && !p.received_listen_port()) return false;
 		// don't send out peers that we haven't successfully connected to
 		if (p.is_connecting()) return false;
+		if (p.in_handshake()) return false;
 		return true;
 	}