[tor-commits] [tor/master] We actually merged this one a while ago.