From: Martin Willi Date: Thu, 17 Apr 2014 08:14:49 +0000 (+0200) Subject: Merge branch 'reauth-collision' X-Git-Tag: 5.2.0dr2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95083fc6fb6ad13b9055f3df594e7f5ba77332dc;p=thirdparty%2Fstrongswan.git Merge branch 'reauth-collision' Fixes two collisions between IKE_SA re-authentication and CHILD_SA rekeying. --- 95083fc6fb6ad13b9055f3df594e7f5ba77332dc