commit 4149b15540a763e6bee1d9aa0f7776701b925bca Merge: 3384638c6 163230e24 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 20 10:43:08 2018 -0400

Merge branch 'maint-0.3.4' into release-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(-)