diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-06-11 20:47:00 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-06-11 20:47:00 -0300 |
| commit | bb4304f397dc954d3aec6cb2139ca5ab9cc0bf06 (patch) | |
| tree | d5809dbc94df6827b555b6437a2b40ad7f5648f7 | |
| parent | 2fc0f0ff1ba9f662f4d933bc02bfa5a74dbaf11a (diff) | |
| parent | cfab94dbfb6e814ece6bb88dfa8fc4bd6cf87d07 (diff) | |
| download | mullvadvpn-bb4304f397dc954d3aec6cb2139ca5ab9cc0bf06.tar.xz mullvadvpn-bb4304f397dc954d3aec6cb2139ca5ab9cc0bf06.zip | |
Merge branch 'resolv-conf-update'
| -rw-r--r-- | Cargo.lock | 8 | ||||
| -rw-r--r-- | talpid-core/Cargo.toml | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index 4e10aabed4..6414002b1a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1145,8 +1145,8 @@ dependencies = [ [[package]] name = "resolv-conf" -version = "0.6.0" -source = "git+https://github.com/tailhook/resolv-conf.git#95d629bdd333916ac4659571ddf03b495329f191" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "quick-error 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1385,7 +1385,7 @@ dependencies = [ "openvpn-plugin 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "os_pipe 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "pfctl 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "resolv-conf 0.6.0 (git+https://github.com/tailhook/resolv-conf.git)", + "resolv-conf 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "shell-escape 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "system-configuration 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "talpid-ipc 0.1.0", @@ -1971,7 +1971,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum regex-syntax 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1ac0f60d675cc6cf13a20ec076568254472551051ad5dd050364d70671bf6b" "checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5" -"checksum resolv-conf 0.6.0 (git+https://github.com/tailhook/resolv-conf.git)" = "<none>" +"checksum resolv-conf 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c62bd95a41841efdf7fca2ae9951e64a8d8eae7e5da196d8ce489a2241491a92" "checksum rustc-demangle 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "76d7ba1feafada44f2d38eed812bd2489a03c0f5abb975799251518b68848649" "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f" "checksum same-file 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cfb6eded0b06a0b512c8ddbcf04089138c9b4362c2f696f3c3d76039d68f3637" diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml index 46c82f15f6..ba17a9993a 100644 --- a/talpid-core/Cargo.toml +++ b/talpid-core/Cargo.toml @@ -23,7 +23,7 @@ talpid-types = { path = "../talpid-types" } [target.'cfg(target_os = "linux")'.dependencies] notify = "4.0" -resolv-conf = { git = "https://github.com/tailhook/resolv-conf.git" } +resolv-conf = "0.6.1" [target.'cfg(target_os = "macos")'.dependencies] pfctl = "0.1" |