summaryrefslogtreecommitdiffhomepage
path: root/talpid-core
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2018-09-07 16:22:29 +0100
committerEmīls Piņķis <emils@mullvad.net>2018-09-11 10:27:05 +0100
commit82ef2d7470370ad0bb4f1810cf77c7cb50d4b0c1 (patch)
tree32c2bb76928adb6fcdaca6bdaaa844338a045a5e /talpid-core
parent2a109139fa7f7992a574055df75b2677661f3143 (diff)
downloadmullvadvpn-82ef2d7470370ad0bb4f1810cf77c7cb50d4b0c1.tar.xz
mullvadvpn-82ef2d7470370ad0bb4f1810cf77c7cb50d4b0c1.zip
Update dependencies and use fixed IPC server implementation for JSONRPC
Diffstat (limited to 'talpid-core')
-rw-r--r--talpid-core/Cargo.toml5
1 files changed, 3 insertions, 2 deletions
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index 1041d184a3..94eb007758 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -10,8 +10,9 @@ atty = "0.2"
duct = "0.11"
error-chain = "0.12"
futures = "0.1"
-jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc", branch = "master" }
-jsonrpc-macros = { git = "https://github.com/paritytech/jsonrpc", branch = "master" }
+jsonrpc-core = { git = "https://github.com/mullvad/jsonrpc", branch = "make-ipc-server-concurrent" }
+jsonrpc-macros = { git = "https://github.com/mullvad/jsonrpc", branch = "make-ipc-server-concurrent" }
+
libc = "0.2.20"
log = "0.4"
openvpn-plugin = { version = "0.3", features = ["serde"] }