commit f3b17a6b261e1feef05dafac247b96b3ea90a521 Merge: c03b1b3f0 66f944f79 Author: teor teor@torproject.org Date: Thu Mar 14 06:56:09 2019 +1000

Merge remote-tracking branch 'tor-github/pr/795' into maint-0.3.4

changes/bug28096 | 13 ++++++++ src/common/compat.c | 95 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 77 insertions(+), 31 deletions(-)