commit a9dab83106b38eed55cad9c53f20bb2e5237ef17 Merge: 6c83fe996 53d5b67f0 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 8 15:25:00 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

changes/ticket31374 | 4 ++++ src/lib/time/compat_time.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)