diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-21 13:41:38 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-21 13:41:38 -0400 |
| commit | fdbdaf8fabd532d8d9b875d135e9f9dde402ab61 (patch) | |
| tree | b1790096a9dadc7740f7f662d1b45b594a0705c6 | |
| parent | 7c83d4043d7f336c14a53418ce91b12335626f6b (diff) | |
| parent | a0514ba531e78bc464ab57e58a443e4d21783718 (diff) | |
| download | tor-fdbdaf8fabd532d8d9b875d135e9f9dde402ab61.tar.gz tor-fdbdaf8fabd532d8d9b875d135e9f9dde402ab61.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug2933 | 4 | ||||
| -rw-r--r-- | src/or/eventdns.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug2933 b/changes/bug2933 new file mode 100644 index 0000000000..7aaf526112 --- /dev/null +++ b/changes/bug2933 @@ -0,0 +1,4 @@ + o Minor bugfixes + - Fix an uncommon assertion failure when running with DNSPort under + heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha. + 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; |