From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 22 Oct 2010 10:47:12 +0000 (+0200)
Subject: Merge local host configuration with server configuration.
X-Git-Tag: release-1.0.14~45
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=ff71f289022ccb91abc2726f16522d55b5ccf0f6;hp=ff71f289022ccb91abc2726f16522d55b5ccf0f6

Merge local host configuration with server configuration.

With some exceptions, tinc only accepted host configuration options for the
local node from the corresponding host configuration file. Although this is
documented, many people expect that they can also put those options in
tinc.conf. Tinc now internally merges the contents of both tinc.conf and the
local host configuration file.
---