commit b4f20ec8a634dc734b103b1773d6565c876e7a24 Merge: bfc847255 c6a154e7b Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 12 16:13:23 2018 -0400 Merge remote-tracking branch 'tor-github/pr/280' changes/bug27165 | 4 ++++ src/core/or/channelpadding.c | 2 ++ src/feature/stats/rephist.c | 30 ++++++++++++++++-------------- src/lib/time/tvdiff.c | 22 ++++++++++++++++++++++ src/lib/time/tvdiff.h | 2 ++ 5 files changed, 46 insertions(+), 14 deletions(-)