commit fd105e1048001ec4498116e7db5304bf7a1c90ca Merge: da805ce 83fe07d Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 16 11:01:23 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into release-0.2.2 changes/bug1345 | 13 ++++++++++ changes/bug2732-simple | 7 +++++ changes/bug2792_checkdir | 8 ++++++ changes/bug2972 | 5 ++++ changes/bug3019 | 4 +++ changes/bug3026 | 4 +++ changes/bug3175 | 7 +++++ doc/tor.1.txt | 5 ++++ src/common/compat.c | 39 +++++++++++++++++++++++++++++++ src/common/compat.h | 2 + src/common/container.c | 21 ++++++++++++++++- src/common/container.h | 4 ++- src/common/di_ops.c | 14 +++++----- src/common/di_ops.h | 1 + src/common/util.c | 58 ++++++++++++++++++++++++++++++++++++++-------- src/common/util.h | 7 ++++- src/or/circuitbuild.c | 57 +++++++++++++++++++++++++++++++++++++++----- src/or/circuitbuild.h | 9 ++++--- src/or/circuituse.c | 51 ++++++++++++++++++++++------------------ src/or/circuituse.h | 2 + src/or/config.c | 40 ++++++++++++++++++++++++++++--- src/or/connection.c | 49 ++++++++++++++++++++++++++++++++++++++ src/or/connection_edge.c | 51 ++++++++++++++++++++++++++++++++++++++-- src/or/connection_edge.h | 1 + src/or/directory.c | 5 ++++ src/or/dirvote.c | 13 ++++++---- src/or/main.c | 1 - src/or/or.h | 4 +++ src/or/routerlist.c | 27 ++++----------------- src/test/test_util.c | 30 +++++++++++++++++++++++ 30 files changed, 450 insertions(+), 89 deletions(-)