Issue #37: consolidation of tor setup