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

changes/bug20988

changes/bug21654

src/common/compat.c

src/common/compat.h

src/common/util.c

src/common/util.h

src/or/dirserv.c

src/or/geoip.c

src/test/test_pt.c

src/test/test_util.c

src/test/test_util_slow.c