summaryrefslogtreecommitdiffhomepage
path: root/talpid-core/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-12-18 11:02:04 +0100
committerLinus Färnstrand <linus@mullvad.net>2017-12-18 11:02:04 +0100
commit7f15829f2dbed506150445cdf53ea6bc05fe9437 (patch)
tree98997c8bd1e3e36b477df0ff8aa5112153e26eca /talpid-core/src
parentc53c07dcd8057533e690e062c0aafc6547992dfa (diff)
parente6fbde01fcdfc6181015f71ce753a038a48509df (diff)
downloadmullvadvpn-7f15829f2dbed506150445cdf53ea6bc05fe9437.tar.xz
mullvadvpn-7f15829f2dbed506150445cdf53ea6bc05fe9437.zip
Merge branch 'upgrade-dependencies'
Diffstat (limited to 'talpid-core/src')
-rw-r--r--talpid-core/src/firewall/mod.rs1
-rw-r--r--talpid-core/src/tunnel/openvpn.rs1
2 files changed, 0 insertions, 2 deletions
diff --git a/talpid-core/src/firewall/mod.rs b/talpid-core/src/firewall/mod.rs
index 17ba65b88d..c3115339f1 100644
--- a/talpid-core/src/firewall/mod.rs
+++ b/talpid-core/src/firewall/mod.rs
@@ -19,7 +19,6 @@ pub mod windows;
use self::windows as imp;
-
error_chain!{
errors {
/// Initialization error
diff --git a/talpid-core/src/tunnel/openvpn.rs b/talpid-core/src/tunnel/openvpn.rs
index f2cc1da7da..f52240a3af 100644
--- a/talpid-core/src/tunnel/openvpn.rs
+++ b/talpid-core/src/tunnel/openvpn.rs
@@ -223,7 +223,6 @@ impl ProcessHandle for duct::Handle {
}
-
mod event_server {
use super::OpenVpnPluginEvent;
use jsonrpc_core::{Error, IoHandler};