summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOdd Stranne <odd@mullvad.net>2018-10-23 12:47:01 +0200
committerOdd Stranne <odd@mullvad.net>2018-10-30 14:57:46 +0100
commit10045211735d5040de7df927a13dc4182360865d (patch)
tree7354b6bbc63e29767c00c55f7772a9ecfd51c5d5
parent1d2aee7a736ed4e6eda1915ddffca84916841b5f (diff)
downloadmullvadvpn-10045211735d5040de7df927a13dc4182360865d.tar.xz
mullvadvpn-10045211735d5040de7df927a13dc4182360865d.zip
Update changelog
-rw-r--r--CHANGELOG.md1
-rw-r--r--talpid-core/src/tunnel/mod.rs1
2 files changed, 1 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc3abcec59..555c02e52d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@ Line wrap the file at 100 chars. Th
- Add new system and in-app notifications to inform the user when the app becomes outdated,
unsupported or may have security issues.
- Allow the user to view the relay in/out IP address in the GUI.
+- Add OpenVPN proxy support via CLI.
### Fixed
- Pick new random relay for each reconnect attempt instead of just retrying with the same one.
diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs
index 1d8d2e967f..beb6b78116 100644
--- a/talpid-core/src/tunnel/mod.rs
+++ b/talpid-core/src/tunnel/mod.rs
@@ -172,7 +172,6 @@ impl TunnelMonitor {
let proxy_auth_file = Self::create_proxy_auth_file(&tunnel_options.openvpn.proxy)
.chain_err(|| ErrorKind::CredentialsWriteError)?;
- // todo: also send proxy file
let cmd = Self::create_openvpn_cmd(
tunnel_endpoint.to_endpoint(),
tunnel_alias,