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

diff --cc src/or/eventdns.c
index b7cc2929ae3c569f04d1096aa3acf1483d76800b,1d93ae048edf4d3db883a580724efd94991aae3d..4753429b1fc97295173eb7df37420344de8a4264
--- 1/src/or/eventdns.c
--- 2/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@@ -2288,10 -2318,9 +2288,10 @@@ _evdns_nameserver_add_impl(const struc
        if (!ns) return -1;
  
        memset(ns, 0, sizeof(struct nameserver));
 -      ns->timeout_event_deleted = __LINE__;
 +
 +      evtimer_set(&ns->timeout_event, nameserver_prod_callback, ns);
  
-       ns->socket = socket(PF_INET, SOCK_DGRAM, 0);
+       ns->socket = socket(address->sa_family, SOCK_DGRAM, 0);
        if (ns->socket < 0) { err = 1; goto out1; }
  #ifdef WIN32
        {