commit 7ef2939e5a902c6159227de176622ee9388e34a4 Merge: eb5d75e 82d8944 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Oct 11 11:16:59 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-october2013 | 3 + src/config/geoip | 2019 ++++++++++++++++++++++++++++----------------- 2 files changed, 1245 insertions(+), 777 deletions(-)