removed some of the extra stuff from upstream tor role