From 73f4b061002d982ba15a1297139db6c1211c96b0 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Wed, 22 Apr 2009 17:56:19 +0000
Subject: [PATCH] fixed merge error

---
 src/bt_peer_connection.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/bt_peer_connection.cpp b/src/bt_peer_connection.cpp
index 41aa4366b..f8e0cc318 100644
--- a/src/bt_peer_connection.cpp
+++ b/src/bt_peer_connection.cpp
@@ -2035,7 +2035,6 @@ namespace libtorrent
 			TORRENT_ASSERT(!m_rc4_encrypted);
 			TORRENT_ASSERT(packet_size() == dh_key_len);
 			TORRENT_ASSERT(recv_buffer == receive_buffer());
-			TORRENT_ASSERT(packet_size() == 5);
 
 			if (!packet_finished()) return;