diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:03:04 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-04-07 12:03:04 -0400 |
| commit | ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3 (patch) | |
| tree | 1debba1496513f76473c42cd910ffe86a074d9e1 /src/or/relay.c | |
| parent | 118d8ffdcb74137a36d22928ce6f46897809391e (diff) | |
| parent | fc647832783cab352bebba63fe0210d7be395058 (diff) | |
| download | tor-ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3.tar.gz tor-ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3.zip | |
Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2
Conflicts:
src/or/or.h
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 076b46b934..807cb3d435 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -791,6 +791,8 @@ connection_ap_process_end_not_open( < MAX_RESOLVE_FAILURES) { /* 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". */ + /* XXXX023 this is a kludgy way to do this. */ tor_assert(circ->_base.timestamp_dirty); circ->_base.timestamp_dirty -= get_options()->MaxCircuitDirtiness; |