From: Tobias Brunner <tobias@strongswan.org>
Date: Mon, 4 May 2015 16:19:13 +0000 (+0200)
Subject: Merge branch 'tkm-fixes'
X-Git-Tag: 5.3.1rc1~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5a201e6bd052bb5ff168423ee6b27c65766cc858;p=thirdparty%2Fstrongswan.git

Merge branch 'tkm-fixes'

This fixes several issues with charon-tkm (e.g. nonce context ID leaks during
rekey collisions).
---

5a201e6bd052bb5ff168423ee6b27c65766cc858