[tor-commits] [tor/master] Merge remote-tracking branch 'pastly/ticket20486'