Some refactoring to prepare a better handeling of Tor in Cryptocat for Mac