[tor-commits] [tor/master] Merge remote-tracking branch 'nickm/ticket29534_040' into maint-0.4.0