[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035