commit e0f707057ba189ff9b5249c11cb9cd04a9740bba Merge: 1dbbc73 7206d78 Author: Roger Dingledine arma@torproject.org Date: Tue May 10 23:07:35 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug2379 | 5 + changes/bug3022 | 6 + changes/dirvote_null_deref | 4 + changes/geoip-may2011 | 3 + changes/mdesc_null_deref | 5 + changes/warn-if-get_digest-fails | 6 + doc/HACKING | 9 +- doc/tor.1.txt | 22 + src/common/compat.c | 1 - src/config/geoip | 6479 ++++++++++++++++++++++++++------------ src/or/circuitbuild.c | 12 +- src/or/config.c | 1 + src/or/connection.c | 2 +- src/or/connection_or.c | 3 +- src/or/control.c | 5 +- src/or/directory.c | 1 + src/or/dirserv.c | 5 +- src/or/dirvote.c | 14 +- src/or/main.c | 2 + src/or/microdesc.c | 2 +- src/or/networkstatus.c | 2 +- src/or/or.h | 8 +- src/or/rendclient.c | 2 +- 23 files changed, 4489 insertions(+), 2110 deletions(-)