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