[tor-commits] [tor/master] Merge branch 'bug32240_042' into bug32240_master