commit 2bc8989d833c3b583395380031e9b730d1c3fb37 Merge: 7667c1cba 3a280b35e Author: teor <teor@torproject.org> Date: Fri Aug 9 09:48:41 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029 changes/ticket31374 | 4 ++++ src/common/compat_time.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)