Merge branch 'ticket31374_029' into ticket31374_035
commitb560d94ac0a9ccbc3db7b4a5611ef1ad4ee7628c
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Aug 2019 15:46:24 +0000 (8 11:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Aug 2019 15:46:24 +0000 (8 11:46 -0400)
treeb969885af9e62c1e867fa7ff212bb5502774d3c7
parente83eabc9bfb6c07f80611beb6b02d43102806a0e
parent3a280b35ee45a1e4f4edaa3891a13d449d87fa8b
Merge branch 'ticket31374_029' into ticket31374_035
src/lib/time/compat_time.c