[tor-commits] [tor/master] finish backing out 5492de76