Merge branch 'tkm-cid-ref'
authorTobias Brunner <tobias@strongswan.org>
Fri, 15 Sep 2017 10:17:07 +0000 (12:17 +0200)
committerTobias Brunner <tobias@strongswan.org>
Fri, 15 Sep 2017 10:17:07 +0000 (12:17 +0200)
This fixes IKE_SA rekey collision handling and improves error handling
if CHILD_SA setup fails.


Trivial merge