Roger Dingledine d310597440 Merge branch 'maint-0.2.2' into release-0.2.2

2011-01-25 16:15:42 -05:00

..

bug2432

Tell which geoip file we're parsing

2011-01-25 15:54:51 -05:00

bug2433

Fix assert for relay/bridge state change

2011-01-25 14:13:06 -05:00