Merge pull request #6930 from mwarning/zerotier
authorDirk Brenken <dev@brenken.org>
Sun, 9 Sep 2018 10:38:42 +0000 (12:38 +0200)
committerGitHub <noreply@github.com>
Sun, 9 Sep 2018 10:38:42 +0000 (12:38 +0200)
zerotier: fix multiple instance handling and port setting


Trivial merge