From b809cfdd4e540ef0481d655d2fa34c9a27ffaa7d Mon Sep 17 00:00:00 2001
From: Martell Malone <martellmalone@gmail.com>
Date: Thu, 28 Nov 2019 17:38:07 -0800
Subject: [PATCH] Update tokio-rustls to 0.12.0

---
 actix-connect/Cargo.toml       | 3 +--
 actix-server-config/Cargo.toml | 3 +--
 actix-server/Cargo.toml        | 3 +--
 actix-test-server/Cargo.toml   | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/actix-connect/Cargo.toml b/actix-connect/Cargo.toml
index 68df4a48..c197beca 100644
--- a/actix-connect/Cargo.toml
+++ b/actix-connect/Cargo.toml
@@ -51,8 +51,7 @@ tokio-openssl = { version = "0.4.0", optional = true }
 
 # rustls
 rust-tls = { version = "0.16.0", package = "rustls", optional = true }
-# tokio-rustls = { version = "0.10.0", optional = true }
-tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }
+tokio-rustls = { version = "0.12.0", optional = true }
 webpki = { version = "0.21", optional = true }
 
 [dev-dependencies]
diff --git a/actix-server-config/Cargo.toml b/actix-server-config/Cargo.toml
index 376330e4..3949b00c 100644
--- a/actix-server-config/Cargo.toml
+++ b/actix-server-config/Cargo.toml
@@ -25,5 +25,4 @@ rustls = ["tokio-rustls"]
 actix-codec = "0.2.0-alpha.1"
 tokio = { version = "0.2", features = ["net", "uds"] }
 tokio-openssl = { version = "0.4.0", optional = true }
-#tokio-rustls = { version = "0.12.0-alpha.8", optional = true }
-tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }
+tokio-rustls = { version = "0.12.0", optional = true }
diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
index 69ca63da..b9b31195 100644
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -55,8 +55,7 @@ tokio-openssl = { version = "0.4.0", optional = true }
 
 # rustls
 rust-tls = { version = "0.16.0", package = "rustls", optional = true }
-# tokio-rustls = { version = "0.12.0-alpha.2", optional = true }
-tokio-rustls = { git = "https://github.com/quininer/tokio-rustls.git", branch = "tokio-0.2", optional = true }
+tokio-rustls = { version = "0.12.0", optional = true }
 webpki = { version = "0.21", optional = true }
 webpki-roots = { version = "0.17", optional = true }
 
diff --git a/actix-test-server/Cargo.toml b/actix-test-server/Cargo.toml
index e0f07bb9..49147cce 100644
--- a/actix-test-server/Cargo.toml
+++ b/actix-test-server/Cargo.toml
@@ -52,7 +52,7 @@ openssl = { version="0.10", optional = true }
 
 #rustls
 rustls = { version = "^0.16", optional = true }
-tokio-rustls = { version = "^0.12.0-alpha.2", optional = true }
+tokio-rustls = { version = "0.12.0", optional = true }
 webpki = { version = "0.21", optional = true }
 webpki-roots = { version = "0.17", optional = true }