[tor-commits] [tor/master] Merge branch 'bug27800-034' into bug27800-035