From: Martin Willi <martin@revosec.ch>
Date: Fri, 20 Feb 2015 14:59:19 +0000 (+0100)
Subject: Merge branch 'connmark'
X-Git-Tag: 5.3.0dr1~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c72fa57a00bbb90d97343d6e340c5c0f1aab16be;p=thirdparty%2Fstrongswan.git

Merge branch 'connmark'

Introduce a connmark plugin that uses Netfilter conntracks mark to select the
correct return-path SAs for client-initiated connections. This can be used
to distinguish transport mode clients behind the same NAT router.

Fixes #365.
---

c72fa57a00bbb90d97343d6e340c5c0f1aab16be