[tor-commits] [tor/master] revert the revert in master, since I didn't want to revert it there