commit d310597440776a9e52f32b48025309a092c0a086 Merge: 5541610 7a446e6 Author: Roger Dingledine <[email protected]> Date: Tue Jan 25 16:15:42 2011 -0500
Merge branch 'maint-0.2.2' into release-0.2.2
changes/bug2432 | 5 +++++
changes/bug2433 | 5 +++++
src/or/config.c | 11 ++++++-----
src/or/geoip.c | 2 +-
4 files changed, 17 insertions(+), 6 deletions(-)
