From a548913e44409334af1f6f1b0f8c02d8d78f5a6a Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Thu, 13 Sep 2018 19:23:09 -0700
Subject: [PATCH] Release openssl 0.10.12

---
 CHANGELOG.md       | 15 ++++++++++++++-
 openssl/Cargo.toml |  4 ++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 18db4b6e..ec2cc392 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [v0.10.12] - 2018-09-13
+
+### Fixed
+
+* Fixed handling of SNI callbacks during renegotiation.
+
+### Added
+
+* Added `SslRef::get_shutdown` and `SslRef::set_shutdown`.
+* Added support for SRTP in DTLS sessions.
+* Added support for LibreSSL 2.8.0.
+
 ## [v0.10.11] - 2018-08-04
 
 ### Added
@@ -250,7 +262,8 @@
 
 Look at the [release tags] for information about older releases.
 
-[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.11...master
+[Unreleased]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.12...master
+[v0.10.12]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.11...openssl-v0.10.12
 [v0.10.11]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.10...openssl-v0.10.11
 [v0.10.10]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.9...openssl-v0.10.10
 [v0.10.9]: https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.8...openssl-v0.10.9
diff --git a/openssl/Cargo.toml b/openssl/Cargo.toml
index c9ac46b9..cc1433cd 100644
--- a/openssl/Cargo.toml
+++ b/openssl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "openssl"
-version = "0.10.11"
+version = "0.10.12"
 authors = ["Steven Fackler <sfackler@gmail.com>"]
 license = "Apache-2.0"
 description = "OpenSSL bindings"
@@ -25,7 +25,7 @@ foreign-types = "0.3.1"
 lazy_static = "1"
 libc = "0.2"
 
-openssl-sys = { version = "0.9.35", path = "../openssl-sys" }
+openssl-sys = { version = "0.9.36", path = "../openssl-sys" }
 
 [dev-dependencies]
 tempdir = "0.3"