commit 75953f9b60406815c96e9b4d324133c31ad1a084 Merge: 1855b4e 8a36f21 Author: Roger Dingledine arma@torproject.org Date: Tue May 10 21:26:01 2011 -0400
Merge branch 'maint-0.2.1' into release-0.2.1
ReleaseNotes | 51 + changes/all_descs | 4 + changes/bug1172 | 9 + changes/bug2402_redux | 6 + changes/bug2475 | 5 + changes/bug2629 | 5 + changes/bug2750 | 6 + changes/bug2933 | 4 + changes/forget-rend-descs-on-newnym | 9 + changes/geoip-apr2011 | 3 + changes/geoip-mar2011 | 3 + changes/ipv6_crash | 4 + changes/zlib_aint_openssl | 3 + configure.in | 8 +- src/common/crypto.c | 2 +- src/common/torint.h | 4 +- src/config/geoip |13026 ++++++++++++++++++++++------------- src/or/Makefile.am | 58 +- src/or/circuitbuild.c | 3 +- src/or/circuituse.c | 19 +- src/or/config.c | 11 +- src/or/dirserv.c | 2 + src/or/eventdns.c | 2 +- src/or/main.c | 2 + src/or/or.h | 2 + src/or/policies.c | 2 + src/or/rendclient.c | 82 +- src/or/rendcommon.c | 10 + src/or/router.c | 22 +- src/or/routerparse.c | 10 +- 30 files changed, 8608 insertions(+), 4769 deletions(-)