From: Guus Sliepen Date: Mon, 14 Apr 2014 18:49:43 +0000 (+0200) Subject: Merge branch '1.1-ed25519' into 1.1 X-Git-Tag: release-1.1pre11~126 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=49e3baec20ddad9cc297c3eeb1d13f0e421f69c8;p=tinc Merge branch '1.1-ed25519' into 1.1 --- 49e3baec20ddad9cc297c3eeb1d13f0e421f69c8