Merge branch 'ticket31374_035' into maint-0.4.1
commit53d5b67f07446f5f4100db032cd47281e0cfd7b1
authorNick Mathewson <nickm@torproject.org>
Thu, 8 Aug 2019 19:24:52 +0000 (8 15:24 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 8 Aug 2019 19:24:52 +0000 (8 15:24 -0400)
tree7d469d99ab98f31d7d7b8156ae54a3ad94033eb3
parent0bc5b7ae95a2cc11b380ba09aab0ed1f4219f90b
parentb560d94ac0a9ccbc3db7b4a5611ef1ad4ee7628c
Merge branch 'ticket31374_035' into maint-0.4.1
src/lib/time/compat_time.c