added tor to win, fixes to osx