[tor-commits] [tor/master] Merge remote branch 'arma/bug2403' into maint-0.2.2