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

changes/bug20988

src/common/compat.c

src/common/compat.h

src/common/util.c

src/or/dirserv.c

src/or/geoip.c

src/test/test_util.c