Fix CI build issues on Windows

Alexander Hansen Færøyrequested to merge
ahf/tor:bugs/40199 into master

These two patches should fix #40199 (closed)

Github PR: https://github.com/torproject/tor/pull/2117

Merge request reports