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