diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2018-09-13 13:52:34 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2018-09-13 13:52:34 +0200 |
| commit | 7cb1310ef768141ed718f3ee0832b0303e4179c9 (patch) | |
| tree | b34c1e80a182cccb86877c629f299cd8bae99bdd | |
| parent | c0ca97c298e93475a49dea549cc33c970b03eee7 (diff) | |
| parent | 7fb01f79fe072f2dbaeb55da85d7a4e441dc8f88 (diff) | |
| download | mullvadvpn-7cb1310ef768141ed718f3ee0832b0303e4179c9.tar.xz mullvadvpn-7cb1310ef768141ed718f3ee0832b0303e4179c9.zip | |
Merge branch 'disable-ipv6-by-default'
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | talpid-types/src/net.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index d4eca6e818..4268335ef7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,7 +24,7 @@ Line wrap the file at 100 chars. Th ## [Unreleased] ### Added -- Add option to enable or disable IPv6 on the tunnel interface. +- Add option to enable or disable IPv6 on the tunnel interface. It's disabled by default. - Log panics in the daemon to the log file. - Warn in the Settings screen if a new version is available. - Add a "blocked" state in the app that blocks the entire network and waits for user action when diff --git a/talpid-types/src/net.rs b/talpid-types/src/net.rs index 65c43e4ae4..31edfb7d48 100644 --- a/talpid-types/src/net.rs +++ b/talpid-types/src/net.rs @@ -148,7 +148,7 @@ impl Default for TunnelOptions { fn default() -> Self { TunnelOptions { openvpn: OpenVpnTunnelOptions::default(), - enable_ipv6: true, + enable_ipv6: false, } } } |