diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-21 13:40:00 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-21 13:40:00 -0400 |
| commit | a0514ba531e78bc464ab57e58a443e4d21783718 (patch) | |
| tree | 7d39d311887d688fd03b16f265a32ce2d11712ac | |
| parent | 3f7f96d9e7aa2254d62d63530c37ee96d4b3abc8 (diff) | |
| parent | e98583594d897ac32745061143e565c6f4b45f97 (diff) | |
| download | tor-a0514ba531e78bc464ab57e58a443e4d21783718.tar.gz tor-a0514ba531e78bc464ab57e58a443e4d21783718.zip | |
Merge remote-tracking branch 'origin/maint-0.2.1' into 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 8b679f8985..25170fe7c6 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; |