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)
commit42aa56961745048ddb5036d8b148aee61011930c
tree4fc2389bad41becc46a35204ad57993e00d3a869
parentda479ae2c9e4176e005b79e70e1bb2d9c9eda88a
parentfc08e6af8a92816b5f1ae2805c22cc82c3a7be4f
Merge branch 'tkm-cid-ref'

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