Trying (fruitlessly) to fix Windows builds.
Merge branch 'master-ipv6-mixed-mode' of /p/condor/repository/CONDOR_SRC into master-ipv6-mixed-mode

Conflicts:
	src/condor_io/sock.cpp