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)
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.


Trivial merge