[tor-commits] [tor/master] Merge branch 'pr_719_squashed_040' into maint-0.4.0