From 411be1c017c03625a79b38dc6a53a2a1b83d8b78 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@cs.umu.se>
Date: Wed, 12 Aug 2015 23:43:38 -0400
Subject: [PATCH] forward port Changelog update

---
 ChangeLog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index b16a1d206..a4b121829 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,8 @@
 	* added support for hashing pieces in multiple threads
 
 
+	* fix bug in uTP that would cause any connection taking more than one second
+	  to connect be timed out (introduced in the vulnerability path)
 	* fixed falling back to sending UDP packets direct when socks proxy fails
 	* fixed total_wanted bug (when setting file priorities in add_torrent_params)