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