[tor-commits] [tor/master] Merge remote-tracking branch 'isis-github/bug22156'