commit 49670ed4a0d92c77afbc24e39035c69ef7c50a2e Merge: 73371db 21d7767 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 6 08:32:41 2017 -0400

Merge branch 'maint-0.2.6' into release-0.2.6

changes/geoip-april2017 | 4 + src/config/geoip | 14366 +++++++++++++++++++++++++++++----------------- src/config/geoip6 | 677 ++- 3 files changed, 9792 insertions(+), 5255 deletions(-)