summaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2010-02-19 16:58:24 -0500
committerNick Mathewson <nickm@torproject.org>2010-02-19 16:58:24 -0500
commit391f75d7927959bb2d77c5adb184c53e17b72cac (patch)
treecb85ef9b483ebd8cd5b9418cc19852f535220a73 /src/or
parent715f104eebac8d35d9cd7a404ac9924e9d623774 (diff)
parent408a828b1f12462f7a31a5d84bcfa38399173b3e (diff)
downloadtor-391f75d7927959bb2d77c5adb184c53e17b72cac.tar.gz
tor-391f75d7927959bb2d77c5adb184c53e17b72cac.zip
Merge remote branch 'sebastian/bug1143'
Diffstat (limited to 'src/or')
-rw-r--r--src/or/dnsserv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c
index 256dcbd75b..8e3e55e795 100644
--- a/src/or/dnsserv.c
+++ b/src/or/dnsserv.c
@@ -299,8 +299,8 @@ dnsserv_configure_listener(connection_t *conn)
tor_assert(conn->s >= 0);
tor_assert(conn->type == CONN_TYPE_AP_DNS_LISTENER);
- conn->dns_server_port = evdns_add_server_port(conn->s, 0,
- evdns_server_callback, NULL);
+ conn->dns_server_port =
+ tor_evdns_add_server_port(conn->s, 0, evdns_server_callback, NULL);
}
/** Free the evdns server port for <b>conn</b>, which must be an