[tor-commits] [tor/release-0.2.3] fold in recent 0.2.3 changes files