diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-04 10:54:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-04 10:54:54 -0500 |
| commit | 46118d7d7542aa960a26a08d9d5fbac33698765c (patch) | |
| tree | 12b52cfd6bbec9ab8b29d97ec585c2a6c162f61b /src/or/relay.c | |
| parent | 05d8111eedee9e11e4bb1c42e93ae2fc168d52ec (diff) | |
| parent | 833d027778ba97020fb5ded1d94e4b21fbcab766 (diff) | |
| download | tor-46118d7d7542aa960a26a08d9d5fbac33698765c.tar.gz tor-46118d7d7542aa960a26a08d9d5fbac33698765c.zip | |
Merge remote-tracking branch 'public/bug10169_023' into bug10169_024
Conflicts:
src/or/relay.c
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 01143f418d..857b7e9d30 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2151,7 +2151,8 @@ cell_queue_append_packed_copy(cell_queue_t *queue, const cell_t *cell, { struct timeval now; packed_cell_t *copy = packed_cell_copy(cell, wide_circ_ids); - tor_gettimeofday_cached(&now); + tor_gettimeofday_cached_monotonic(&now); + copy->inserted_time = (uint32_t)tv_to_msec(&now); /* Remember the time when this cell was put in the queue. */ |