diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-04-11 10:48:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-04-11 10:48:46 -0400 |
| commit | 0c8f901ee7c3cfd2351e7f6e723998226fabe190 (patch) | |
| tree | 57a5e659ec646857bed9c741d8d1fc4a3cea2122 /src/or/circuituse.c | |
| parent | 6bdfaa8b244ca3e10e57f6d99616af1d5f68fa67 (diff) | |
| parent | f9ba0c65467fe80f65b3789365cfac874198a337 (diff) | |
| download | tor-0c8f901ee7c3cfd2351e7f6e723998226fabe190.tar.gz tor-0c8f901ee7c3cfd2351e7f6e723998226fabe190.zip | |
Merge branch 'maint-0.3.3'
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 8d388cc2c6..fe28dd9a1a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -383,7 +383,7 @@ count_pending_general_client_circuits(void) SMARTLIST_FOREACH_BEGIN(circuit_get_global_list(), circuit_t *, circ) { if (circ->marked_for_close || circ->state == CIRCUIT_STATE_OPEN || - circ->purpose != CIRCUIT_PURPOSE_C_GENERAL || + !CIRCUIT_PURPOSE_COUNTS_TOWARDS_MAXPENDING(circ->purpose) || !CIRCUIT_IS_ORIGIN(circ)) continue; |