[tor-commits] [tor/master] Merge remote-tracking branch 'asn-github/bug26358'