[tor-commits] [tor/maint-0.2.2] Merge branch 'cov217_022_squashed' into maint-0.2.2