From 95161ed313db11296c3bd473336340dbb19bb347 Mon Sep 17 00:00:00 2001
From: Kenneth Reitz <me@kennethreitz.com>
Date: Fri, 29 Aug 2014 10:32:18 -0400
Subject: [PATCH] v2.4.0 changelog

---
 HISTORY.rst | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index aeff9468..26d5c65b 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -3,10 +3,21 @@
 Release History
 ---------------
 
-2.3.1 (?)
-+++++++++
+2.4.0 (2014-08-29)
+++++++++++++++++++
+
+**Behavioral Changes**
+
+- ``Connection: keep-alive`` header is now sent automatically.
+
+**Improvements**
+
+- Support for connect timeouts! Timeout now accepts a tuple (connect, read) which is used to set individual connect and read timeouts.
+- Allow copying of PreparedRequests without headers/cookies.
+- Updated bundled urllib3 version.
+- Refactored settings loading from environment — new `Session.merge_environment_settings`.
+- Handle socket errors in iter_content.
 
-- Allow copying of PreparedRequests without headers/cookies
 
 2.3.0 (2014-05-16)
 ++++++++++++++++++