[tor-commits] [tor/release-0.2.5] fold in changes for 0.2.5.6-alpha so far