[tor-commits] [tor/master] Merge branch 'bug32240_32242_041' into bug32240_32242_042