From 8a04a974641db52671c970436d9522e1b8197c69 Mon Sep 17 00:00:00 2001
From: Sean McArthur <sean@seanmonstar.com>
Date: Wed, 11 Jul 2018 17:20:20 -0700
Subject: [PATCH] v0.12.6

---
 CHANGELOG.md | 11 +++++++++++
 Cargo.toml   |  2 +-
 src/lib.rs   |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7aaf8bd3..bfaf1cd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### v0.12.6 (2018-07-11)
+
+
+#### Features
+
+* **client:**
+  * add ability to include `SO_REUSEADDR` option on sockets ([13862d11](https://github.com/hyperium/hyper/commit/13862d11ad329e5198622ad3e924e1aa05ab2c8a), closes [#1599](https://github.com/hyperium/hyper/issues/1599))
+  * implement rfc 6555 (happy eyeballs) ([02a9c29e](https://github.com/hyperium/hyper/commit/02a9c29e2e816c8a583f65b372fcf7b8503e6bad))
+* **server:** add `Builder::http1_pipeline_flush` configuration ([5b5e3090](https://github.com/hyperium/hyper/commit/5b5e3090955c1b6c1e7a8cb97b43de8d099f5303))
+
+
 ### v0.12.5 (2018-06-28)
 
 
diff --git a/Cargo.toml b/Cargo.toml
index e8750267..6e03f2fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "hyper"
-version = "0.12.5" # don't forget to update html_root_url
+version = "0.12.6" # don't forget to update html_root_url
 description = "A fast and correct HTTP library."
 readme = "README.md"
 homepage = "https://hyper.rs"
diff --git a/src/lib.rs b/src/lib.rs
index 401d925c..fc8ff280 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,4 @@
-#![doc(html_root_url = "https://docs.rs/hyper/0.12.5")]
+#![doc(html_root_url = "https://docs.rs/hyper/0.12.6")]
 #![deny(missing_docs)]
 #![deny(warnings)]
 #![deny(missing_debug_implementations)]