commit 0b74f6427568e441b3ede9a1c27200a392bd5154 Merge: 887bddb 1db1b23 Author: Roger Dingledine arma@torproject.org Date: Thu Jan 5 06:38:15 2012 -0500

Merge branch 'maint-0.2.1' into release-0.2.1

changes/bug4786 | 9 + src/config/geoip | 9630 +++++++++++++++++++++++++++++------------------------- src/or/relay.c | 4 - 3 files changed, 5102 insertions(+), 4541 deletions(-)