strongswan.org
Wiki/Project Management
Downloads
Gitweb
projects
/
strongswan.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
209a611
aa4b6ed
)
Merge branch '2365-android-nat-keepalive'
author
Tobias Brunner
<tobias@strongswan.org>
Mon, 3 Jul 2017 08:33:52 +0000
(10:33 +0200)
committer
Tobias Brunner
<tobias@strongswan.org>
Mon, 3 Jul 2017 08:33:52 +0000
(10:33 +0200)
This makes the NAT-T keepalive interval configurable per connection.
Fixes #2365.
Trivial merge