diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-10-05 17:53:22 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-10-05 17:53:22 +0200 |
| commit | 81a5881063e3ccca83444d5423f7b36a9b037352 (patch) | |
| tree | afa5d9bda22e1d91993a6e6fb5335add0889fc02 | |
| parent | 52fd39bba60643a67f24b769d3d319624fd0c12d (diff) | |
| parent | e9f3278f4aa1e8915e48d28a471f832a8c5dd654 (diff) | |
| download | mullvadvpn-2017.1-beta4.tar.xz mullvadvpn-2017.1-beta4.zip | |
Merge branch 'use-public-pfctl'2017.1-beta4
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 318f0f3f86..fb3007dc3b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -865,7 +865,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pfctl" version = "0.1.0" -source = "git+ssh://git@github.com/mullvad/pfctl-rs.git#35ca17308409ffab07e3a2a7c9c9ba3c81f8ee5e" +source = "git+https://github.com/mullvad/pfctl-rs?rev=35ca17308409ffab07e3a2a7c9c9ba3c81f8ee5e#35ca17308409ffab07e3a2a7c9c9ba3c81f8ee5e" dependencies = [ "bindgen 0.29.0 (registry+https://github.com/rust-lang/crates.io-index)", "derive_builder 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1194,7 +1194,7 @@ dependencies = [ "libc 0.2.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "openvpn-plugin 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pfctl 0.1.0 (git+ssh://git@github.com/mullvad/pfctl-rs.git)", + "pfctl 0.1.0 (git+https://github.com/mullvad/pfctl-rs?rev=35ca17308409ffab07e3a2a7c9c9ba3c81f8ee5e)", "socket-relay 0.1.0", "talpid-ipc 0.1.0", "talpid-types 0.1.0", @@ -1587,7 +1587,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum parking_lot_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0ad2c4d148942b3560034785bf19df586ebba53351e8c78f84984147d5795eef" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum percent-encoding 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de154f638187706bde41d9b4738748933d64e6b37bdbffc0b47a97d16a6ae356" -"checksum pfctl 0.1.0 (git+ssh://git@github.com/mullvad/pfctl-rs.git)" = "<none>" +"checksum pfctl 0.1.0 (git+https://github.com/mullvad/pfctl-rs?rev=35ca17308409ffab07e3a2a7c9c9ba3c81f8ee5e)" = "<none>" "checksum pkg-config 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "3a8b4c6b8165cd1a1cd4b9b120978131389f64bdaf456435caa41e630edba903" "checksum quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18c45c4854d6d1cf5d531db97c75880feb91c958b0720f4ec1057135fec358b3" "checksum quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9e25fa23c044c1803f43ca59c98dac608976dd04ce799411edd58ece776d4" diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index fc2df075ec..a5073bce4a 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -22,7 +22,7 @@ talpid-types = { path = "../talpid-types" } libc = "0.2.20" [target.'cfg(target_os = "macos")'.dependencies] -pfctl = { git = "ssh://git@github.com/mullvad/pfctl-rs.git" } +pfctl = { git = "https://github.com/mullvad/pfctl-rs", rev = "35ca17308409ffab07e3a2a7c9c9ba3c81f8ee5e" } socket-relay = { path = "../socket-relay" } tokio-core = "0.1" |