From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 15 Sep 2017 10:17:07 +0000 (+0200)
Subject: Merge branch 'tkm-cid-ref'
X-Git-Tag: 5.6.1dr3~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=42aa56961745048ddb5036d8b148aee61011930c;p=thirdparty%2Fstrongswan.git

Merge branch 'tkm-cid-ref'

This fixes IKE_SA rekey collision handling and improves error handling
if CHILD_SA setup fails.
---

42aa56961745048ddb5036d8b148aee61011930c