commit 5f518c69aa634ee3487c2d8b40d2b4b0c3317f52 Merge: c470a6d27 9c37e8c8d Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 6 15:43:50 2017 -0500

Merge remote-tracking branch 'public/monotime_coarse_stamps'

src/common/buffers.c | 6 ++-- src/common/buffers.h | 3 +- src/common/compat_time.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++ src/common/compat_time.h | 17 +++++++++++ src/or/circuitlist.c | 57 ++++++++++++++++++------------------ src/or/or.h | 4 +-- src/or/relay.c | 9 +++--- src/test/test_buffers.c | 24 ++++++++------- src/test/test_oom.c | 36 +++++++++++++---------- src/test/test_util.c | 8 +++++ 10 files changed, 174 insertions(+), 66 deletions(-)