[tor-commits] [tor/master] Merge branch 'bug21369_check_029_squashed' into maint-0.3.0