From: Mathias Hall-Andersen <mathias@hall-andersen.dk>
Date: Sun, 4 Feb 2018 15:48:03 +0000 (+0100)
Subject: Merge branch 'master' into timer-teardown
X-Git-Tag: 0.0.20180514~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=283e7117cfd4be3c524701de20307faef7ebcf86;p=thirdparty%2Fwireguard-go.git

Merge branch 'master' into timer-teardown
---

283e7117cfd4be3c524701de20307faef7ebcf86