commit d89b8e075116ae28e1a168d8fecc9a901a736a17 Merge: 2a02efb 5cad78c Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 11 13:34:32 2013 -0400 Merge remote-tracking branch 'karsten/geoip-manual-update-mar2013' src/config/geoip-manual | 76 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-)