commit 2f872f9762128228e98f74bf7cb53aed54aee088 Merge: 4c0e434f3 45d3b5fa4 Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 28 14:47:05 2018 -0400

Merge remote-tracking branch 'hello71/bug25398'

changes/bug25398 | 2 ++ src/common/compat.c | 36 ++---------------------------------- 2 files changed, 4 insertions(+), 34 deletions(-)