fixes #734 ZeroTier port discrimination busted
fixes #734 ZeroTier port discrimination busted

This reverts 707, and provides a correct fix for busted
port discrimination.  It also has a few minor cleanups
and reduces the listen timeout to 10 seconds.

nanomsg/nng,nanomsg/nng,nanomsg/nng,nanomsg/nng