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