commit f2445fc608fcb71cbff913dddcc4c2a38417535f Merge: a3b8286 adaf6a4 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 9 08:34:30 2016 -0500

Merge branch 'maint-0.2.9'

changes/geoip-december2016 | 4 + src/config/geoip | 6259 ++++++++++++++++++++++++++------------------ src/config/geoip6 | 1193 ++++++++- 3 files changed, 4705 insertions(+), 2751 deletions(-)