[tor-commits] [tor/maint-0.3.5] Merge branch 'ticket31374_029' into ticket31374_035