[tor-commits] [tor/master] Merge branches 'cov217_021' and 'cid_450' into maint-0.2.1