[tor-commits] [tor/master] Merge branch 'bug20203_027_squashed' into maint-0.2.8