[tor-commits] [tor/master] Merge remote-tracking branch 'github/bug27139_034' into maint-0.3.4

[nickm at torproject.org]

commit 163230e2405af394ce3684dc7fdf2475bf1318b0
Merge: 2ddbaf9cd 9a90f4c6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 20 10:43:05 2018 -0400

    Merge remote-tracking branch 'github/bug27139_034' into maint-0.3.4

 changes/bug27139           | 14 ++++++++++++++
 src/common/compat_time.c   | 22 ++++++++++++++++------
 src/common/compat_time.h   |  1 +
 src/test/test_circuitmux.c | 13 +++++++++----
 4 files changed, 40 insertions(+), 10 deletions(-)