Nick Mathewson 813019cc57 Merge branch 'bug23512-v4-029-fixes' %!s(int64=5) %!d(string=hai) anos
..
geoip.c 83b8a76f0c Fix a shadowed-global warning in geoip.c %!s(int64=5) %!d(string=hai) anos
geoip.h ef486e3c02 Fix every include path changed in the previous commit (automated) %!s(int64=5) %!d(string=hai) anos
rephist.c 813019cc57 Merge branch 'bug23512-v4-029-fixes' %!s(int64=5) %!d(string=hai) anos
rephist.h 813019cc57 Merge branch 'bug23512-v4-029-fixes' %!s(int64=5) %!d(string=hai) anos