[tor-commits] [tor/master] Merge branch 'bug28348_035' into bug28348_036