[tor-commits] [tor/master] Merge branch 'bug8787_squashed'