From a15b4ef5145d1ad74527cc8cc09d28a994830287 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 1 Jul 2014 00:49:21 +0000
Subject: [PATCH] update changelog now that the udp_socket fix is back-ported
 to RC_0_16

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

diff --git a/ChangeLog b/ChangeLog
index 99892b4e3..f083ace52 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
 1.0 release
 
-	* fix bug in udp_socket when changing socks5 proxy quickly
 	* fix bugs in convert_to/from_native() on windows
 	* fix support for web servers not supporting keepalive
 	* support storing save_path in resume data
@@ -58,6 +57,8 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* fix bug in udp_socket when changing socks5 proxy quickly
+
 0.16.17 release
 
 	* don't fall back on wildcard port in UPnP