[tor-commits] [tor/release-0.4.1] Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035

[teor at torproject.org]

commit 65343a966e48e6eb49873f3cdb9a9f68bf72c70c
Merge: 4665ac9ec b560d94ac
Author: teor <teor at torproject.org>
Date:   Fri Aug 9 09:49:35 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035

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