From: Nick Mathewson Date: Thu, 7 Apr 2011 16:03:04 +0000 (-0400) Subject: Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2 X-Git-Tag: tor-0.2.2.25-alpha~19^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3;p=thirdparty%2Ftor.git Merge remote-tracking branch 'public/xxx_fixups' into maint-0.2.2 Conflicts: src/or/or.h --- ba0cd8094f8e6ae0113ad69958d9d0973bb1f2c3 diff --cc src/or/or.h index 3cadd3173e,e44c626d73..1688a08f96 --- a/src/or/or.h +++ b/src/or/or.h @@@ -2126,9 -2126,16 +2126,15 @@@ typedef struct circuit_t * length ONIONSKIN_CHALLENGE_LEN. */ char *n_conn_onionskin; - time_t timestamp_created; /**< When was this circuit created? */ + struct timeval timestamp_created; /**< When was the circuit created? */ - time_t timestamp_dirty; /**< When the circuit was first used, or 0 if the - * circuit is clean. */ + /** When the circuit was first used, or 0 if the circuit is clean. + * + * XXXX023 Note that some code will artifically adjust this value backward + * in time in order to indicate that a circuit shouldn't be used for new + * streams, but that it can stay alive as long as it has streams on it. + * That's a kludge we should fix. + */ + time_t timestamp_dirty; - struct timeval highres_created; /**< When exactly was the circuit created? */ uint16_t marked_for_close; /**< Should we close this circuit at the end of * the main loop? (If true, holds the line number