commit 558f7d3701ef0236e0bf2886dca538cfe1ad18bd Merge: 94c27d4 1e3cf1c Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 19 11:42:26 2016 +0200

Merge branch 'monotonic_v2_squashed'

changes/monotonic | 6 + src/common/compat.c | 91 +------- src/common/compat.h | 15 +- src/common/compat_libevent.c | 30 --- src/common/compat_libevent.h | 1 - src/common/compat_time.c | 513 +++++++++++++++++++++++++++++++++++++++++++ src/common/compat_time.h | 150 +++++++++++++ src/common/include.am | 1 + src/common/timers.c | 50 ++--- src/common/timers.h | 3 +- src/or/buffers.c | 9 +- src/or/circuitlist.c | 6 +- src/or/main.c | 2 + src/or/relay.c | 4 +- src/test/test-timers.c | 20 +- src/test/test_util.c | 125 +++++++++++ 16 files changed, 856 insertions(+), 170 deletions(-)