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