From: Martin Willi <martin@revosec.ch>
Date: Wed, 4 Feb 2015 10:31:47 +0000 (+0100)
Subject: Merge branch 'tkm-reqid-alloc'
X-Git-Tag: 5.3.0dr1~80
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a75980c4aaa7a31dc1455a01abbf36547c9c8bf2;p=thirdparty%2Fstrongswan.git

Merge branch 'tkm-reqid-alloc'

Fixes expires raised by charon-tkm to actually use a proto/dst/SPI tuple to
identify CHILD_SAs.
---

a75980c4aaa7a31dc1455a01abbf36547c9c8bf2