commit f366b0112eecb4b59d823ff96b9241898349804b Merge: 81fcebc c718921 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 7 11:39:56 2012 -0500

Merge remote-tracking branch 'karsten/task-6266'

changes/geoip-dec2012 | 3 + changes/geoip-nov2012 | 3 + changes/task-6266 | 7 + src/config/README.geoip | 90 + src/config/deanonymind.py | 194 + src/config/geoip |124322 ++++++++++----------------------------------- src/config/geoip-manual | 114 + 7 files changed, 26265 insertions(+), 98468 deletions(-)