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