Rather than just retaining our clearnet identity from the environment, maintain any tor one as well. This is a little cleaner and avoids confusion over port assignment when converting to real names. Fixes #136