[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2