commit b26d59d7158c2a1883dfeba26eff820f37660ced Merge: b5e9c86 5ddb9b3 Author: Roger Dingledine arma@torproject.org Date: Fri Jul 6 16:32:32 2012 -0400

Merge branch 'maint-0.2.3' into release-0.2.3

changes/revert-geoip-may2012 | 6 + src/config/geoip |35480 ++++++++++++++++++++++++++---------------- 2 files changed, 22134 insertions(+), 13352 deletions(-)