commit df6385b9fde3db33389b2a29d1caf87e6a131b95 Merge: 17c24b3 ae15b55 Author: Roger Dingledine arma@torproject.org Date: Tue Jan 15 16:32:14 2013 -0500

Merge branch 'maint-0.2.3' into release-0.2.3

changes/bug7889 | 8 + changes/geoip-dec2012 | 3 + changes/geoip-jan2013 | 3 + changes/geoip-nov2012 | 3 + src/config/geoip |128849 ++++++++++--------------------------------------- src/or/command.c | 8 + src/or/relay.c | 17 + 7 files changed, 25447 insertions(+), 103444 deletions(-)