commit 975dd009ec011f9c301c10f7483b661b172f9a96 Merge: 0daad3e 75fc4db Author: Roger Dingledine arma@torproject.org Date: Fri May 18 16:49:50 2012 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug5259 | 3 + changes/bug5346 | 8 + changes/bug5796 | 4 + changes/geoip-may2012 | 3 + changes/routerlist_ins_replace | 5 + doc/tor.1.txt | 5 +- src/common/util.c | 26 +- src/config/geoip | 748 ++++++++++++++++++++++++++++++++++------ src/or/control.c | 4 + src/or/routerlist.c | 7 + src/test/test_util.c | 71 ++++ 11 files changed, 768 insertions(+), 116 deletions(-)