tor: modernize