commit 304d8f3bbbf063c2ee504568dde134296a2025ca Merge: e4d82da 1b4984f Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 6 09:58:54 2016 -0400
Merge branch 'maint-0.2.4' into maint-0.2.5
changes/geoip-october2016 | 4 + src/config/geoip | 63919 +++++++++++++++++++++++++++++++++----------- src/config/geoip6 | 1496 +- 3 files changed, 48664 insertions(+), 16755 deletions(-)