commit bcdc0022693c75ea1523468e783bf03832e0a358 Merge: 7159e19 9b233ac Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 5 11:22:48 2013 -0400

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

src/config/geoip-manual | 53 ----------------------------------------------- 1 file changed, 53 deletions(-)