no protocol for this entry
more refactoring and corrections
removed tor submodule, missing stuff upstream
re-added our own fork