commit 87d6a149a10db3b8f2d6b008cecab00cf81278a1 Merge: 24aaeef 7fe80c2 Author: Nick Mathewson nickm@torproject.org Date: Mon May 9 14:57:03 2016 -0400

Merge branch 'maint-0.2.7' into release-0.2.7

changes/build18490 | 4 + changes/geoip-may2016 | 4 + src/config/geoip | 6991 ++++++++++++++++++++++++++++--------------------- src/config/geoip6 | 904 +++++-- src/test/include.am | 9 +- 5 files changed, 4641 insertions(+), 3271 deletions(-)