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)
commita75980c4aaa7a31dc1455a01abbf36547c9c8bf2
tree5093dc57e2621cad0078594ae2919b7f77827e04
parent94eb09ac354c5dfee033a62c93dabf011e9c9747
parent65566c37caec653bd91f488083f95387e9fbc1f3
Merge branch 'tkm-reqid-alloc'

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