[tor-commits] [tor/maint-0.3.5] Merge branch 'bug28245_029' into maint-0.2.9