removed tor, PR has been merged, will go back to upstream
added back tor submodule, from upstream