Refactoring tor/non-tor reporting options again