[tor-commits] [tor/master] Merge remote branch 'rransom/bug2572' into maint-0.2.2