[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9

[teor at torproject.org]

commit 7660a7cf7d4191e44aba0bf3e02a001d7e979d29
Merge: 511aeba8e 97d73db7c
Author: teor <teor at torproject.org>
Date:   Wed Oct 23 08:20:45 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9

 changes/ticket31001 | 6 ++++++
 src/common/compat.c | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)