Merge pull request #10888 from mwarning/zerotier
authorRosen Penev <rosenp@gmail.com>
Sat, 28 Dec 2019 19:39:29 +0000 (11:39 -0800)
committerGitHub <noreply@github.com>
Sat, 28 Dec 2019 19:39:29 +0000 (11:39 -0800)
zerotier: backport from master


Trivial merge