Merge remote-tracking branch 'public/monotime_coarse_stamps'

diff --cc src/common/buffers.c
Simple merge

diff --cc src/common/buffers.h
Simple merge

diff --cc src/common/compat_time.c
Simple merge

diff --cc src/or/or.h
Simple merge