[tor-commits] [tor/master] Merge branch 'bug40083_035' into bug40083_042