For both onion and transport as per discussion on #43
For both onion and transport as per discussion on #43