commit 3e3b9219ec968f21ab0956dd785c17541a908d5b Merge: 6429313 f4ef7c7 Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 11 11:17:25 2013 -0400

Merge remote-tracking branch 'karsten/geoip-manual-update-oct2013'

src/config/geoip-manual | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)