chencl <chenchenglin@outlook.com>
Merge branch 'master' of https://github.com/maxmind/geoip-api-c

Conflicts:
	libGeoIP/GeoIPUpdate.c
	libGeoIP/base64.c
	libGeoIP/base64.h
Merge branch 'master' of https://github.com/maxmind/geoip-api-c
Merge branch 'master' of https://github.com/maxmind/geoip-api-c

Conflicts:
	Makefile.am
	README.md
	configure.ac
	libGeoIP/GeoIP.h
	libGeoIP/GeoIPCity.h
	libGeoIP/Makefile.am
	libGeoIP/timeZone.c
	ltmain.sh
	man/geoiplookup.1
	man/geoiplookup6.1
项目文件修改