From 327578048252493d0aaa0b0cdcdd673280b53869 Mon Sep 17 00:00:00 2001
From: Tim Savannah <kata198@gmail.com>
Date: Wed, 24 May 2017 01:23:34 -0400
Subject: [PATCH] Changelog

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

diff --git a/ChangeLog b/ChangeLog
index e7c15d9..d4e380e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+* 4.0.1 - ??? ?? ????
+
+- If func_timeout completes the function call in the alloted time, explicitly
+clean up the thread (previously we were only cleaning it up in the time-out
+path). On python3 it would get cleaned up anyway on the next garbage
+collection cycle, on python2 it's a bit more finnikey (but will also,
+eventually, get automatically joined)
+
+
 * 4.0.0 - May 20 2017
 
 - Fixup short delay after a thread times out