[tor-commits] [tor/release-0.2.3] Merge remote-tracking branch 'arma/bug7037' into maint-0.2.3