diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-04-11 01:29:24 -0400 |
| commit | 887eba98950f2974bd2031510e1ece2279a4f106 (patch) | |
| tree | 0bda88092333a1aa21925033596f395df4e3d4b1 /src/or/dnsserv.h | |
| parent | fcd9248387249d68619734a73860ffaab12b021b (diff) | |
| parent | 6acf0ac2851fb95953edea9c231d82f487f28c3d (diff) | |
| download | tor-887eba98950f2974bd2031510e1ece2279a4f106.tar.gz tor-887eba98950f2974bd2031510e1ece2279a4f106.zip | |
Merge branch 'maint-0.2.4' into release-0.2.4
Diffstat (limited to 'src/or/dnsserv.h')
| -rw-r--r-- | src/or/dnsserv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/dnsserv.h b/src/or/dnsserv.h index 6bdb98de70..687a77e59e 100644 --- a/src/or/dnsserv.h +++ b/src/or/dnsserv.h @@ -20,7 +20,8 @@ void dnsserv_resolved(entry_connection_t *conn, const char *answer, int ttl); void dnsserv_reject_request(entry_connection_t *conn); -int dnsserv_launch_request(const char *name, int is_reverse); +int dnsserv_launch_request(const char *name, int is_reverse, + control_connection_t *control_conn); #endif |