Merge branch '2365-android-nat-keepalive'
authorTobias Brunner <tobias@strongswan.org>
Mon, 3 Jul 2017 08:33:52 +0000 (10:33 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 3 Jul 2017 08:33:52 +0000 (10:33 +0200)
commit6f0888c8724638c9553f408cdae9e57adb9e4b7e
tree6e1cd86a351c217dcd0ca58ff1eaf439fddb3c21
parent209a611530b62a2086295dcc842915c1202e2338
parentaa4b6eda5900f5e14affddee2702da8dc1c7e281
Merge branch '2365-android-nat-keepalive'

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

Fixes #2365.