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/buffers.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/buffers.c')
| -rw-r--r-- | src/or/buffers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c index c0a3534d8d..c2eb228d29 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -631,7 +631,7 @@ buf_add_chunk_with_capacity(buf_t *buf, size_t capacity, int capped) chunk = chunk_new_with_alloc_size(preferred_chunk_size(capacity)); } - tor_gettimeofday_cached(&now); + tor_gettimeofday_cached_monotonic(&now); chunk->inserted_time = (uint32_t)tv_to_msec(&now); if (buf->tail) { |