Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/eventdns.c

diff --cc src/or/eventdns.c
index 725b59a19e50eb4b078c32691322a99673efc2c4,4753429b1fc97295173eb7df37420344de8a4264..0a0fef43f3b2bb5795ae7980cd2bdc1ea8daa638
--- 1/src/or/eventdns.c
--- 2/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@@ -2291,7 -2291,7 +2291,7 @@@ _evdns_nameserver_add_impl(const struc
  
        evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
  
-       ns->socket = tor_open_socket(PF_INET, SOCK_DGRAM, 0);
 -      ns->socket = socket(address->sa_family, SOCK_DGRAM, 0);
++      ns->socket = tor_open_socket(address->sa_family, SOCK_DGRAM, 0);
        if (ns->socket < 0) { err = 1; goto out1; }
  #ifdef WIN32
        {