[tor-commits] [torbirdy/master] Enhanced global namespace pollution and removed redundant code