commit bf4559c8488d30f53a6b420b8ac61732e7e22c4d Merge: 0c18b2d 43c18b1 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 14:39:17 2017 -0500

Merge branch 'maint-0.2.6' into release-0.2.6

changes/geoip-february2017 | 4 + src/config/geoip | 10832 ++++++++++++++++++++++++------------------- src/config/geoip6 | 1651 ++++++- 3 files changed, 7351 insertions(+), 5136 deletions(-)