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