Merge changes I6779a835,I4e3d8322

* changes:
  Only connect to one address per address family.
  Update our user agent to something newer.