commit ba0c0ef771b3de5bc69bddfda0383734c69def87 Merge: beeeeb0af 428f8a375 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 20 12:15:23 2017 -0500

Merge branch 'maint-0.2.5' into release-0.2.5

changes/geoip-2017-12-06 | 4 + src/config/geoip | 12380 +++++++++++++++++++++++++++------------------ src/config/geoip6 | 3373 +++++++++--- 3 files changed, 10033 insertions(+), 5724 deletions(-)