summaryrefslogtreecommitdiff
path: root/src/or/eventdns.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-04-21 13:41:38 -0400
committerNick Mathewson <nickm@torproject.org>2011-04-21 13:41:38 -0400
commitfdbdaf8fabd532d8d9b875d135e9f9dde402ab61 (patch)
treeb1790096a9dadc7740f7f662d1b45b594a0705c6 /src/or/eventdns.c
parent7c83d4043d7f336c14a53418ce91b12335626f6b (diff)
parenta0514ba531e78bc464ab57e58a443e4d21783718 (diff)
downloadtor-fdbdaf8fabd532d8d9b875d135e9f9dde402ab61.tar.gz
tor-fdbdaf8fabd532d8d9b875d135e9f9dde402ab61.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/eventdns.c')
-rw-r--r--src/or/eventdns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/eventdns.c b/src/or/eventdns.c
index 9030dfbbb4..aca76d8d55 100644
--- a/src/or/eventdns.c
+++ b/src/or/eventdns.c
@@ -1904,7 +1904,7 @@ server_request_free(struct server_request *req)
if (req->port) {
if (req->port->pending_replies == req) {
- if (req->next_pending)
+ if (req->next_pending && req->next_pending != req)
req->port->pending_replies = req->next_pending;
else
req->port->pending_replies = NULL;