diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-03-08 15:23:30 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-03-08 15:23:30 -0500 |
| commit | d5907e7d9d79297cc7359aeae810972a1b834e23 (patch) | |
| tree | 799dc235420d86b270c985970e4dbedbfc8e45c6 /src/or/circuitbuild.c | |
| parent | 26009a3ed06549b7d7def9b96b327b906db16bd8 (diff) | |
| parent | 9ad083d5731c983ea3e961822306c50ce32dfcc2 (diff) | |
| download | tor-d5907e7d9d79297cc7359aeae810972a1b834e23.tar.gz tor-d5907e7d9d79297cc7359aeae810972a1b834e23.zip | |
Merge remote branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index cfc6b0d350..7ad3b07500 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4748,7 +4748,8 @@ any_pending_bridge_descriptor_fetches(void) conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE && !conn->marked_for_close && - conn->linked && !conn->linked_conn->marked_for_close) { + conn->linked && + conn->linked_conn && !conn->linked_conn->marked_for_close) { log_debug(LD_DIR, "found one: %s", conn->address); return 1; } |