commit f3d666366555226ec2ad0f647489a1d42145a2eb Merge: 9dfa244 4aac35c Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 18 12:39:40 2011 -0400

Merge remote branch 'sebastian/bug2696' into maint-0.2.2

changes/bug2696 | 5 +++++ configure.in | 24 +++++++++++++++++++----- src/or/geoip.c | 18 +++++++++++++----- 3 files changed, 37 insertions(+), 10 deletions(-)