[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2