[tor-commits] [tor/master] Merge remote-tracking branch 'ahf/bugs/20988'

[nickm at torproject.org]

commit 88b91d775345037f1d743ecc4d7d392b15d501bb
Merge: 2c8d2ca ae91e64
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 6 12:04:58 2017 -0500

    Merge remote-tracking branch 'ahf/bugs/20988'

 changes/bug20988     |  4 ++++
 src/common/compat.c  | 39 +++++++++++++++++++++++++++++++++++++++
 src/common/compat.h  |  2 ++
 src/common/util.c    |  4 ++--
 src/or/dirserv.c     |  4 ++--
 src/or/geoip.c       |  2 +-
 src/test/test_util.c | 22 +++++++++++++---------
 7 files changed, 63 insertions(+), 14 deletions(-)