From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 8 Mar 2016 09:56:27 +0000 (+0100)
Subject: Merge branch 'charon-conf-fallback'
X-Git-Tag: 5.4.0rc1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=819da83fccf99acf7af1ed2bf61a498425c375e1;p=thirdparty%2Fstrongswan.git

Merge branch 'charon-conf-fallback'

Makes charon-systemd and charon-svc also load settings from the charon
section in strongswan.conf.

Fixes #1300.
---

819da83fccf99acf7af1ed2bf61a498425c375e1