commit 0e7f15fdb6a5523ab1d4c856b5db455df3b3e1aa Merge: 0aa794d30 67a313f0e Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 13 10:58:02 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

changes/geoip-2018-03-08 | 4 + src/config/geoip | 36382 ++++++++++++--------------------------------- src/config/geoip6 | 662 +- 3 files changed, 9970 insertions(+), 27078 deletions(-)