projects / strongswan.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47a0e28 f9ceb5b)
Merge branch 'android-pfs'
authorTobias Brunner <tobias@strongswan.org>
Fri, 12 Sep 2014 08:24:48 +0000 (10:24 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 12 Sep 2014 08:24:48 +0000 (10:24 +0200)
Changes how CHILD_SA rekeying errors are handled in the Android app and adds
CHILD_SA proposals with DH groups.


Trivial merge
strongSwan - IPsec VPN