diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-06-17 15:25:18 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-06-17 15:25:18 -0400 |
| commit | 42d6f3459053aaafbed2ab215e9e85ae5d594b5a (patch) | |
| tree | af9ec3c2de7d40e6c4de3a6e7b739a7843eaaa8b /src/or/circuituse.c | |
| parent | 31b9b1a5bb3d3fb60e39f5a789ee4fbc2009f6a4 (diff) | |
| parent | 85d4c290d79264d334baa9e5c8fdf3b06d0b3d79 (diff) | |
| download | tor-42d6f3459053aaafbed2ab215e9e85ae5d594b5a.tar.gz tor-42d6f3459053aaafbed2ab215e9e85ae5d594b5a.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 45fe3df671..67677ef050 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -74,7 +74,8 @@ circuit_is_acceptable(circuit_t *circ, edge_connection_t *conn, return 0; } - if (purpose == CIRCUIT_PURPOSE_C_GENERAL) + if (purpose == CIRCUIT_PURPOSE_C_GENERAL || + purpose == CIRCUIT_PURPOSE_C_REND_JOINED) if (circ->timestamp_dirty && circ->timestamp_dirty+get_options()->MaxCircuitDirtiness <= now) return 0; |