[tor-commits] [tor/master] Fix a couple more msvc issues, reported by gisle vanem