[tor-commits] [tor/release-0.2.2] fold in some more changes entries