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)
commitf640af5b7a68bd5230e07eb54fe7432a240192d8
treeea4253044a0c26f715efdb95fc11b9433e2402b6
parent47a0e289d96c570273f0d2c7c2bba70357b56c59
parentf9ceb5b54349bfd4667d8f9579d228073de3ec7d
Merge branch 'android-pfs'

Changes how CHILD_SA rekeying errors are handled in the Android app and adds
CHILD_SA proposals with DH groups.