commit 67357ca9f3be9d7320bc995f02f60d991b3ecd27 Merge: e234c1c ff2c9ac Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 14 16:06:03 2011 -0500

Merge branch 'maint-0.2.1' into release-0.2.1

changes/bug4410 | 5 + changes/geoip-december2011 | 3 + changes/geoip-november2011 | 3 + src/config/geoip |14817 ++++++++++++++++++++++++++++---------------- src/or/routerparse.c | 5 + 5 files changed, 9617 insertions(+), 5216 deletions(-)