[tor-commits] [tor/master] Merge branch 'xfer_time_coarse'

[nickm at torproject.org]

commit 69a320ce5d84308c8749e9311ad6888d5aae5d3b
Merge: d43dc120e 60bf8f6cf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 20 09:15:30 2017 -0500

    Merge branch 'xfer_time_coarse'

 changes/bug24613               |   4 ++
 src/common/compat_time.c       |  91 +++++++++++++++++++++++++++++++++
 src/common/compat_time.h       |  22 ++++++++
 src/or/channel.c               |  12 ++---
 src/or/channel.h               |  11 ++--
 src/or/channelpadding.c        |  54 +++++++++++---------
 src/test/test_channel.c        |   6 +--
 src/test/test_channelpadding.c | 112 ++++++++++++++++++++++++++---------------
 src/test/test_util.c           |  61 ++++++++++++++++++++++
 9 files changed, 292 insertions(+), 81 deletions(-)