summaryrefslogtreecommitdiff
path: root/src/or/connection_edge.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-01-28 16:30:06 +0000
committerNick Mathewson <nickm@torproject.org>2009-01-28 16:30:06 +0000
commit8027c8c6dd20ab285684db7aa0738cd5898e2aef (patch)
treed5528a303e93914e1ce8864cfc1b2369fb4332d0 /src/or/connection_edge.c
parentef001cf85d07039ebacf6dadb4cb81dc58a30620 (diff)
downloadtor-8027c8c6dd20ab285684db7aa0738cd5898e2aef.tar.gz
tor-8027c8c6dd20ab285684db7aa0738cd5898e2aef.zip
Forward-port: Fix bug 893: check AP connections for markedness before expiring them.
svn:r18299
Diffstat (limited to 'src/or/connection_edge.c')
-rw-r--r--src/or/connection_edge.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 5454e33228..3cfac78c3b 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -401,7 +401,7 @@ connection_ap_expire_beginning(void)
smartlist_t *conns = get_connection_array();
SMARTLIST_FOREACH_BEGIN(conns, connection_t *, c) {
- if (c->type != CONN_TYPE_AP)
+ if (c->type != CONN_TYPE_AP || c->marked_for_close)
continue;
conn = TO_EDGE_CONN(c);
/* if it's an internal linked connection, don't yell its status. */