]> git.ipfire.org Git - people/ms/strongswan.git/commitdiff
projects / people / ms / strongswan.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94eb09a 65566c3)
Merge branch 'tkm-reqid-alloc'
authorMartin Willi <martin@revosec.ch>
Wed, 4 Feb 2015 10:31:47 +0000 (11:31 +0100)
committerMartin Willi <martin@revosec.ch>
Fri, 20 Feb 2015 12:34:54 +0000 (13:34 +0100)
Fixes expires raised by charon-tkm to actually use a proto/dst/SPI tuple to
identify CHILD_SAs.


Trivial merge
Michael's strongswan development tree