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