commit 733afb52a8267d4b74e9437c71a0d8c65a9b954a Merge: 911f95ed9 a9c84bfd3 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 11 09:45:48 2019 -0400 Merge branch 'maint-0.4.0' src/lib/time/compat_time.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)