[tor-commits] [tor/maint-0.4.0] Merge branch 'ticket31372_029' into ticket31372_035