diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:17:20 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:17:20 -0400 |
| commit | 67d88a7d6021e95a2d423a9f26811accd1da39b6 (patch) | |
| tree | 30d48f5f922b928f7727ed812905101e5bf24012 /src/or/dnsserv.c | |
| parent | 07ab483e62457ee56187037304f25ec50cb0850a (diff) | |
| parent | ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3 (diff) | |
| download | tor-67d88a7d6021e95a2d423a9f26811accd1da39b6.tar.gz tor-67d88a7d6021e95a2d423a9f26811accd1da39b6.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/address.c
src/common/compat_libevent.c
src/common/memarea.c
src/common/util.h
src/or/buffers.c
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection.c
src/or/directory.c
src/or/networkstatus.c
src/or/or.h
src/or/routerlist.c
Diffstat (limited to 'src/or/dnsserv.c')
| -rw-r--r-- | src/or/dnsserv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 8222c8b45d..f7a8d35f78 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -19,7 +19,7 @@ #ifdef HAVE_EVENT2_DNS_H #include <event2/dns.h> #include <event2/dns_compat.h> -/* XXXX022 this implies we want an improved evdns */ +/* XXXX023 this implies we want an improved evdns */ #include <event2/dns_struct.h> #else #include "eventdns.h" |