commit c6ca199888102a825f004f8613331f97525da486 Merge: 5e0ce4c 3dde6d5 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Mar 11 13:32:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-mar2013 | 3 + src/config/geoip |92875 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 85446 insertions(+), 7432 deletions(-)