[tor-commits] [tor/master] Merge remote-tracking branch 'ffmancera/github/bug24677'