[tor-commits] [tor/master] Merge remote-tracking branch 'ahf/bugs/21665'