[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry-github/bug26259'