commit 9abbfef2f729804d58a3dec051079e5a05e58fa6 Merge: 5d706dd fa62d96 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 12 09:47:30 2013 -0400 Merge remote-tracking branch 'karsten/geoip-manual-update-aug2013' src/config/geoip-manual | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-)