Merge "Make host resolver call __connect() rather than connect() so mark isn't cleared."