From: Ivo Timmermans <ivo@lychnis.net>
Date: Sat, 17 Jun 2000 20:30:44 +0000 (+0000)
Subject: Merge changes from 1.6-1.8.
X-Git-Tag: release-1.0pre3~193
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=1c8adb5e1f12894fc9a478fbf29678fb662e03ab;hp=1c8adb5e1f12894fc9a478fbf29678fb662e03ab

Merge changes from 1.6-1.8.
---