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