[tor-commits] [tor/master] Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1