diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-30 14:58:26 -0400 |
| commit | 21de9d46e264ceb14f3fe59d17210d82f2499637 (patch) | |
| tree | 225afa4993f268fc867d922e646f0449cedebf1c /src/or/dnsserv.c | |
| parent | 5dc3c462dcf42488055685e7f4fdb4a1a48003f1 (diff) | |
| parent | da7c60dcf310fb9914bfd1b84a34b440ab04900a (diff) | |
| download | tor-21de9d46e264ceb14f3fe59d17210d82f2499637.tar.gz tor-21de9d46e264ceb14f3fe59d17210d82f2499637.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/common/compat.c
src/or/main.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 243b730cbf..009ab5f344 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -306,7 +306,7 @@ void dnsserv_configure_listener(connection_t *conn) { tor_assert(conn); - tor_assert(conn->s >= 0); + tor_assert(SOCKET_OK(conn->s)); tor_assert(conn->type == CONN_TYPE_AP_DNS_LISTENER); conn->dns_server_port = |