incorporating new tor code