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