Consolidate geoip and geoip6 changes when they happened in the same commit. ([diff](https://trac.torproject.org/projects/tor/wiki/doc/MetricsTimeline?action=diff&version=213)) URL: https://trac.torproject.org/projects/tor/wiki/doc/MetricsTimeline?version=213