[tor-commits] [tor/master] Merge branch 'ticket32177_035' into ticket32177_040