commit c24b90e3ac011b6ca0a66d59cdbbde20135ec79c Merge: fecc5c61f 9666c620d Author: Nick Mathewson nickm@torproject.org Date: Sat Nov 11 12:23:33 2017 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/geoip-2017-11-06 | 4 + src/config/geoip | 9406 ++++++++++++++++++++++++++++------------------ src/config/geoip6 | 848 ++++- 3 files changed, 6426 insertions(+), 3832 deletions(-)