[tor-commits] [tor/master] apply 6abb638954b to 0.2.3.16-alpha too