[tor-commits] [tor/master] Merge branch 'doc31089_035' into doc31089_040