[tor-commits] [tor/master] Merge remote-tracking branch 'nickm/bug6271_part_a' into maint-0.2.3