diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:00:02 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-03-04 11:00:02 -0500 |
| commit | bb375442141b4a5b301212394ce3e106cb34daf2 (patch) | |
| tree | 96a5baed08b8212b1b719e8ad72507d76e34bb99 /src/or/buffers.c | |
| parent | c8d41da52d6ae1edd1c4999e328b1e7eadc0ab5b (diff) | |
| parent | 46118d7d7542aa960a26a08d9d5fbac33698765c (diff) | |
| download | tor-bb375442141b4a5b301212394ce3e106cb34daf2.tar.gz tor-bb375442141b4a5b301212394ce3e106cb34daf2.zip | |
Merge remote-tracking branch 'public/bug10169_024' into bug10169_025_v2
Conflicts:
src/common/compat_libevent.h
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 271964c5ac..87e8abffe9 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -680,7 +680,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) { |