diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:36:25 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 16:36:25 -0400 |
| commit | 597cd893c557f8e05be98b6cade1b312fc6f0f8d (patch) | |
| tree | e0739825eef13b029be94b06ea742d38f888aad4 /src/or/relay.c | |
| parent | 01407f9718a7b1eb4e43b46c2799a390551aad29 (diff) | |
| parent | 7bb51fdd89feb5ea3eb7e0a0b76c0dda0e50a82e (diff) | |
| download | tor-597cd893c557f8e05be98b6cade1b312fc6f0f8d.tar.gz tor-597cd893c557f8e05be98b6cade1b312fc6f0f8d.zip | |
Merge remote-tracking branch 'public/bug6174' into maint-0.2.4
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 8e80d14a87..ef37c32810 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -17,6 +17,7 @@ #include "channel.h" #include "circuitbuild.h" #include "circuitlist.h" +#include "circuituse.h" #include "config.h" #include "connection.h" #include "connection_edge.h" @@ -851,9 +852,7 @@ connection_ap_process_end_not_open( /* We haven't retried too many times; reattach the connection. */ circuit_log_path(LOG_INFO,LD_APP,circ); /* Mark this circuit "unusable for new streams". */ - /* XXXX024 this is a kludgy way to do this. */ - tor_assert(circ->base_.timestamp_dirty); - circ->base_.timestamp_dirty -= get_options()->MaxCircuitDirtiness; + mark_circuit_unusable_for_new_conns(circ); if (conn->chosen_exit_optional) { /* stop wanting a specific exit */ |