[tor-commits] [tor/master] Merge branch 'bug25399_squashed'

[nickm at torproject.org]

commit 24abcf9771bd13fd4b3a7a33274ff667b56688f2
Merge: d9ba7db38 608aa62ec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 22 08:49:43 2018 -0400

    Merge branch 'bug25399_squashed'

 changes/bug25399    |  5 +++++
 configure.ac        |  9 +--------
 src/common/compat.c | 27 ++++++---------------------
 src/common/compat.h |  4 ++--
 4 files changed, 14 insertions(+), 31 deletions(-)