From f98d38e973952541b38abb5068b94a9e7bf1d691 Mon Sep 17 00:00:00 2001
From: arvidn <arvid@cs.umu.se>
Date: Mon, 20 Jul 2015 08:33:54 -0700
Subject: [PATCH] merge Changelog

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

diff --git a/ChangeLog b/ChangeLog
index a180f3391..a22f6d2bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -72,7 +72,10 @@
 	* almost completely changed the storage interface (for custom storage)
 	* added support for hashing pieces in multiple threads
 
+1.0.6 release
+
 	* fix request queue size performance issue
+	* slightly improve UDP tracker performance
 	* fix http scrape
 	* add missing port mapping functions to python binding
 	* fix bound-checking issue in bdecoder