[tor-commits] [tor/master] Merge branch 'bug23053_029' into maint-0.3.1