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