[tor-commits] [tor/release-0.4.6] Fold in the last-minute fixes