summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorBug Magnet <marco.nikic@mullvad.net>2024-07-26 15:39:19 +0200
committerBug Magnet <marco.nikic@mullvad.net>2024-07-26 15:39:19 +0200
commit81451e14ce84d78aa2ad1600da50d97e2ebc88ab (patch)
tree8af2964206a456e0f3118d318cee6fa6e741408f
parent55cfd69fc4bc3292a97e440531fa20e2e09b9e99 (diff)
parenta262b99155f3004f7ef3c798620b9580f1d6febe (diff)
downloadmullvadvpn-81451e14ce84d78aa2ad1600da50d97e2ebc88ab.tar.xz
mullvadvpn-81451e14ce84d78aa2ad1600da50d97e2ebc88ab.zip
Merge branch 'allow-multihop-in-release-and-update-changelog-ios-769'
-rw-r--r--ios/CHANGELOG.md6
-rw-r--r--ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift2
2 files changed, 4 insertions, 4 deletions
diff --git a/ios/CHANGELOG.md b/ios/CHANGELOG.md
index 0329156519..297240e7c9 100644
--- a/ios/CHANGELOG.md
+++ b/ios/CHANGELOG.md
@@ -22,8 +22,10 @@ Line wrap the file at 100 chars. Th
* **Security**: in case of vulnerabilities.
## [Unreleased]
-
-
+### Added
+- Add multihop, a feature that routes traffic through two
+ of our relays before it reaches the internet.
+
## [2024.4 - 2024-06-25]
### Added
- Add Post-Quantum secure tunnels.
diff --git a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
index da8e9cdacc..1bac5f42c7 100644
--- a/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
+++ b/ios/MullvadVPN/View controllers/VPNSettings/VPNSettingsDataSource.swift
@@ -412,9 +412,7 @@ final class VPNSettingsDataSource: UITableViewDiffableDataSource<
snapshot.appendItems([.dnsSettings], toSection: .dnsSettings)
snapshot.appendItems([.ipOverrides], toSection: .ipOverrides)
- #if DEBUG
snapshot.appendItems([.multihop], toSection: .multiHop)
- #endif
applySnapshot(snapshot, animated: animated, completion: completion)
}