[tor-commits] [tor/release-0.2.2] clean up and fold in newer changes files