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/circuitlist.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/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index d1fea37c25..d11b457944 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1023,6 +1023,7 @@ circuit_mark_all_unused_circs(void) * This is useful for letting the user change pseudonyms, so new * streams will not be linkable to old streams. */ +/* XXX023 this is a bad name for what this function does */ void circuit_expire_all_dirty_circs(void) { @@ -1033,6 +1034,8 @@ circuit_expire_all_dirty_circs(void) if (CIRCUIT_IS_ORIGIN(circ) && !circ->marked_for_close && circ->timestamp_dirty) + /* XXXX023 This is a screwed-up way to say "This is too dirty + * for new circuits. */ circ->timestamp_dirty -= options->MaxCircuitDirtiness; } } |