[tor-commits] [tor/maint-0.4.1] Merge branch 'ticket31687_035' into ticket31687_040