commit d19db9305b36c3190d4d4e5b389cc8df350f3a5f Merge: df6385b 9630fb9 Author: Roger Dingledine <arma@torproject.org> Date: Fri Apr 19 11:11:24 2013 -0400 Merge branch 'maint-0.2.3' into release-0.2.3 changes/bug8208 | 4 + changes/bug8377 | 3 + changes/geoip-apr2013 | 3 + changes/geoip-feb2013 | 3 + changes/geoip-mar2013 | 3 + src/common/address.c | 3 +- src/config/geoip |88093 +++++++++++++++++++++++++++++++++++++++++++------ src/or/router.c | 8 +- src/test/test_addr.c | 36 + 9 files changed, 78373 insertions(+), 9783 deletions(-)