Merge "Fix spurious DNS lookups in the C library."