[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'bug28525_029' into maint-0.3.5