[tor-commits] [tor/master] Merge branch 'bug32673_035'