[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug26283'