commit 98402d0865b70fc9b920c21f196b5f1b3a499938 Merge: 1208c17 a1074c7 Author: Roger Dingledine arma@torproject.org Date: Thu Jan 5 06:46:01 2012 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug1240 | 8 + changes/bug4786 | 9 + changes/bug4788 | 6 + changes/bug4803 | 4 + changes/clang_30_options | 5 + changes/geoip-january2012 | 3 + changes/timersub_bug | 7 + configure.in | 10 +- src/common/compat.h | 4 +- src/config/geoip | 9630 ++++++++++++++++++++++++--------------------- src/or/connection.c | 29 +- src/or/dirserv.c | 23 +- src/or/relay.c | 4 - 13 files changed, 5164 insertions(+), 4578 deletions(-)