From ef9032e440a361c5bd5d19e3a085b314c2b0940d Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Wed, 24 Oct 2018 21:19:10 +0200
Subject: [PATCH] Update TunnelKit

- Improve logging performance and privacy.
- Fix server-side renegotiation issues.
---
 CHANGELOG.md                                  |  4 +++-
 .../Sources/Model/ConnectionService.swift     |  8 +-------
 Podfile                                       |  2 +-
 Podfile.lock                                  | 20 +++++++++----------
 4 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aed74409..f5a67b39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## 1.0 beta 1083 (2018-10-24)
 
 ### Fixed
 
 - Original configuration not saved after reset.
+- Connection occasionally turning inactive after a while.
+- Improved performance and privacy of debug log.
 
 ## 1.0 beta 1075 (2018-10-23)
 
diff --git a/Passepartout/Sources/Model/ConnectionService.swift b/Passepartout/Sources/Model/ConnectionService.swift
index b0ee8e15..5e537ab3 100644
--- a/Passepartout/Sources/Model/ConnectionService.swift
+++ b/Passepartout/Sources/Model/ConnectionService.swift
@@ -267,13 +267,7 @@ class ConnectionService: Codable {
     }
     
     var vpnLog: String {
-        guard let logKey = tunnelConfiguration.debugLogKey else {
-            return ""
-        }
-        guard let lines = defaults.array(forKey: logKey) as? [String] else {
-            return ""
-        }
-        return lines.joined(separator: "\n")
+        return tunnelConfiguration.existingLog(in: appGroup) ?? ""
     }
     
     var vpnLastError: TunnelKitProvider.ProviderError? {
diff --git a/Podfile b/Podfile
index 16769b8e..5733d614 100644
--- a/Podfile
+++ b/Podfile
@@ -3,7 +3,7 @@ use_frameworks!
 
 def shared_pods
     #pod 'TunnelKit', '~> 1.1.2'
-    pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => 'f7bb3a3'
+    pod 'TunnelKit', :git => 'https://github.com/keeshux/tunnelkit', :commit => '6995b88'
     #pod 'TunnelKit', :path => '../tunnelkit'
 end
 
diff --git a/Podfile.lock b/Podfile.lock
index 99aaaa6a..7b9a5c56 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -2,19 +2,19 @@ PODS:
   - MBProgressHUD (1.1.0)
   - OpenSSL-Apple (1.1.0i-v2)
   - SwiftyBeaver (1.6.1)
-  - TunnelKit (1.2.1):
-    - TunnelKit/AppExtension (= 1.2.1)
-    - TunnelKit/Core (= 1.2.1)
-  - TunnelKit/AppExtension (1.2.1):
+  - TunnelKit (1.2.2):
+    - TunnelKit/AppExtension (= 1.2.2)
+    - TunnelKit/Core (= 1.2.2)
+  - TunnelKit/AppExtension (1.2.2):
     - SwiftyBeaver
     - TunnelKit/Core
-  - TunnelKit/Core (1.2.1):
+  - TunnelKit/Core (1.2.2):
     - OpenSSL-Apple (~> 1.1.0h)
     - SwiftyBeaver
 
 DEPENDENCIES:
   - MBProgressHUD
-  - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `f7bb3a3`)
+  - TunnelKit (from `https://github.com/keeshux/tunnelkit`, commit `6995b88`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
@@ -24,20 +24,20 @@ SPEC REPOS:
 
 EXTERNAL SOURCES:
   TunnelKit:
-    :commit: f7bb3a3
+    :commit: 6995b88
     :git: https://github.com/keeshux/tunnelkit
 
 CHECKOUT OPTIONS:
   TunnelKit:
-    :commit: f7bb3a3
+    :commit: 6995b88
     :git: https://github.com/keeshux/tunnelkit
 
 SPEC CHECKSUMS:
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
   OpenSSL-Apple: a93b8f2eec8783ff40d9a9304de180ab68bb647c
   SwiftyBeaver: ccfcdf85a04d429f1633f668650b0ce8020bda3a
-  TunnelKit: 6c790dfbcb0042d6a5dfe2fda5b0eb5b895afaf1
+  TunnelKit: 15c88f0cef7b926883566a9455e912a1e55f4048
 
-PODFILE CHECKSUM: f39e32152761feedf93ae76c3d769b002a2084af
+PODFILE CHECKSUM: 159cfb999715d0ff9a22a7824f3b25dea9908ef0
 
 COCOAPODS: 1.6.0.beta.2