summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-09-13 19:39:15 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-09-13 19:39:15 +0200
commitd2138880b974a99d2d8947976e7d2e86b4e395fa (patch)
treed4744a821ae6ba0bf253cdf1b3cbfdbfb1164d52
parent6f683cdafc7e751fba6ced7bb8c08672c2f8bf26 (diff)
parent67542d1397358fa818015d3743f3f4e82de39a74 (diff)
downloadmullvadvpn-d2138880b974a99d2d8947976e7d2e86b4e395fa.tar.xz
mullvadvpn-d2138880b974a99d2d8947976e7d2e86b4e395fa.zip
Merge branch 'remove-unused-openssl-patch'
-rw-r--r--Cargo.lock5
-rw-r--r--Cargo.toml3
2 files changed, 0 insertions, 8 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 020d8b94a7..162c2d1731 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2157,11 +2157,6 @@ dependencies = [
"winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
-[[patch.unused]]
-name = "openssl-sys"
-version = "0.9.34"
-source = "git+https://github.com/mullvad/rust-openssl#4dbd237fe1f6454d8a0042ccf4ad157904d6eec1"
-
[metadata]
"checksum aho-corasick 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c1c6d463cbe7ed28720b5b489e7c083eeb8f90d08be2a0d6bb9e1ffea9ce1afa"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
diff --git a/Cargo.toml b/Cargo.toml
index cb296616d2..8e68361379 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,6 +12,3 @@ members = [
"talpid-core",
"talpid-ipc",
]
-
-[patch.crates-io]
-openssl-sys = { git = "https://github.com/mullvad/rust-openssl" }