commit a7e317927b9901a5b1d1d8de010093816da76425 Merge: e788c57 459e5d7 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 12 10:27:23 2016 -0400

Merge branch 'maint-0.2.8'

changes/geoip-august2016 | 4 + src/config/geoip | 14009 +++++++++++++++++++++++++-------------------- src/config/geoip6 | 1108 +++- 3 files changed, 8582 insertions(+), 6539 deletions(-)