commit 68a169ec55f4d1e1b5b9e4f396267681ee3c4ba5 Merge: 79d55f6 f0d9e2d Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 28 22:08:53 2011 -0400
Merge remote-tracking branch 'origin/maint-0.2.2' into release-0.2.2
changes/bug2475 | 5 + changes/bug2722 | 11 ++ changes/bug3012 | 5 + changes/bug3020 | 7 ++ changes/bug3039 | 5 + changes/clear_trackexithost | 5 + changes/forget-rend-descs-on-newnym | 21 ++++ changes/gmtime_null | 6 + changes/ticket2497 | 4 + src/common/compat.c | 112 +++++++++++++++++++--- src/common/compat.h | 9 -- src/common/crypto.c | 2 +- src/common/torint.h | 4 +- src/or/circuitbuild.c | 5 +- src/or/circuituse.c | 19 +++- src/or/config.c | 35 ++++++- src/or/config.h | 1 + src/or/connection_edge.c | 4 +- src/or/dirserv.c | 3 + src/or/hibernate.c | 3 +- src/or/main.c | 9 ++ src/or/rendclient.c | 177 ++++++++++++++++++++++++----------- src/or/rendclient.h | 1 + src/or/rendcommon.c | 10 ++ src/or/rendcommon.h | 1 + src/or/rephist.c | 14 +++- src/or/router.c | 8 +- src/or/routerlist.c | 10 +-- 28 files changed, 387 insertions(+), 109 deletions(-)