From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 3 Jul 2017 08:33:52 +0000 (+0200)
Subject: Merge branch '2365-android-nat-keepalive'
X-Git-Tag: 5.6.0dr1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f0888c8724638c9553f408cdae9e57adb9e4b7e;p=thirdparty%2Fstrongswan.git

Merge branch '2365-android-nat-keepalive'

This makes the NAT-T keepalive interval configurable per connection.

Fixes #2365.
---

6f0888c8724638c9553f408cdae9e57adb9e4b7e