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

[teor at torproject.org]

commit e07d08a169c3dd43f4cd134c8f993c3f199c2bcc
Merge: e0f9a8222 0e0cf4abd
Author: teor <teor at torproject.org>
Date:   Sat Aug 10 07:21:43 2019 +1000

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

 changes/bug30561    |  6 ++++++
 src/common/compat.c | 17 +++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)