[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5