Merge branch 'trap-shunt-updates'
authorTobias Brunner <tobias@strongswan.org>
Mon, 27 Jul 2015 12:00:23 +0000 (14:00 +0200)
committerTobias Brunner <tobias@strongswan.org>
Mon, 27 Jul 2015 12:00:23 +0000 (14:00 +0200)
commit5af74bcb8482e432c5abf6a53c3f53ee93af577f
treee31f82008b706624a084e2a72209cf1116697ab3
parent6f7a3b33bc044e0c212be54be74b9497d513ca86
parentc04345d5edbbc4c37027cdfc21dba85d03e312af
Merge branch 'trap-shunt-updates'

Changes how acquires are tracked in the trap manager, which fixes
several race conditions.  Also fixes races between threads installing
trap policies and the main thread trying to flush the trap policies.
Similar changes were added to the shunt manager which previously
used no locking at all.

Fixes #1014.