commit 3826a88fc072f97673ee3b106f3dd1b93c875b27 Merge: e3d166b a1c6a40 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Oct 21 13:14:27 2014 -0400 Merge remote-tracking branch 'teor/bug13476-improve-time-handling' changes/bug13476-improve-time-handling | 20 +++ src/common/compat.c | 18 ++- src/common/util.c | 68 +++++--- src/test/test_util.c | 264 ++++++++++++++++++++++++++++++-- 4 files changed, 331 insertions(+), 39 deletions(-)