From 38d08e02132659641b9167e0cfe6129e088ca7a1 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean.monstar@gmail.com>
Date: Mon, 3 Aug 2015 11:59:58 -0700
Subject: [PATCH] v0.6.7

---
 CHANGELOG.md | 27 +++++++++++++++++++++++++++
 Cargo.toml   |  2 +-
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a213dd20..86528bd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+### v0.6.7 (2015-08-03)
+
+
+#### Bug Fixes
+
+* **headers:** fix broken deserialization of headers ([f5f5e1cb](https://github.com/hyperium/hyper/commit/f5f5e1cb2d01a22f170432e73b9c5757380cc18b))
+
+
+#### Features
+
+* **net:**
+  * Implement NetworkConnector for closure to be more flexible ([abdd4c5d](https://github.com/hyperium/hyper/commit/abdd4c5d632059ebef9bbee95032c9500620212e))
+  * add socket timeouts to Server and Client ([7d1f154c](https://github.com/hyperium/hyper/commit/7d1f154cb7b4db4a029b52857c377000a3f23419), closes [#315](https://github.com/hyperium/hyper/issues/315))
+
+
+#### Breaking Changes
+
+* Any custom implementation of NetworkStream must now
+  implement `set_read_timeout` and `set_write_timeout`, so those will
+  break. Most users who only use the provided streams should work with
+  no changes needed.
+
+Closes #315
+
+ ([7d1f154c](https://github.com/hyperium/hyper/commit/7d1f154cb7b4db4a029b52857c377000a3f23419))
+
+
 ### v0.6.5 (2015-07-23)
 
 
diff --git a/Cargo.toml b/Cargo.toml
index 2dc5e239..5611c4ee 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "hyper"
-version = "0.6.6"
+version = "0.6.7"
 description = "A modern HTTP library."
 readme = "README.md"
 documentation = "http://hyperium.github.io/hyper/hyper/index.html"