Actually get Marionette integrated with Tor. This depends on first assessing it (legacy/trac#29272 (moved))