Merge branch 'master' into merge-master-into-release-2.0a

This commit is contained in:
Jacob Hoffman-Andrews
2020-11-22 23:38:53 -08:00

View File

@@ -30,10 +30,10 @@ cookie = { version = "0.14", features = ["percent-encode"], optional = true}
once_cell = "1" once_cell = "1"
url = "2" url = "2"
socks = { version = "0.3.2", optional = true } socks = { version = "0.3.2", optional = true }
rustls = { version = "0.18", optional = true, features = [] } rustls = { version = "0.19", optional = true, features = [] }
webpki = { version = "0.21", optional = true } webpki = { version = "0.21", optional = true }
webpki-roots = { version = "0.20", optional = true } webpki-roots = { version = "0.21", optional = true }
rustls-native-certs = { version = "0.4", optional = true } rustls-native-certs = { version = "0.5", optional = true }
serde = { version = "1", optional = true } serde = { version = "1", optional = true }
serde_json = { version = "1", optional = true } serde_json = { version = "1", optional = true }
encoding = { version = "0.2", optional = true } encoding = { version = "0.2", optional = true }