Merge remote-tracking branch 'karsten/bug5053'

changes/bug5053

src/or/connection_or.c

src/or/directory.c

src/or/geoip.c

src/or/geoip.h

src/test/test.c