From: Guus Sliepen Date: Sat, 12 Jul 2014 20:25:55 +0000 (+0200) Subject: Merge branch 'keysegfault' of https://github.com/dechamps/tinc into 1.1 X-Git-Tag: release-1.1pre11~60 X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=19e42b76f546dc3baee4a5d6a4f161155d279c74 Merge branch 'keysegfault' of https://github.com/dechamps/tinc into 1.1 --- 19e42b76f546dc3baee4a5d6a4f161155d279c74