[tor-commits] [tor/master] Merge branch 'ticket28668_035' into ticket28668_040