commit a5d40c2d0f1372c119d4a4a4b0287ecea298322e Merge: 228b77f 2bb6bdc Author: Nick Mathewson <nickm@torproject.org> Date: Sun May 15 11:40:14 2011 -0400 Merge branch 'bug1345' into maint-0.2.2 changes/bug1345 | 13 +++++++++++ src/common/container.c | 19 +++++++++++++++++ src/common/container.h | 2 + src/or/circuituse.c | 41 +++++++++++++++++++++++------------- src/or/circuituse.h | 2 + src/or/config.c | 23 ++++++++++++++++++++ src/or/connection_edge.c | 51 +++++++++++++++++++++++++++++++++++++++++++-- src/or/connection_edge.h | 1 + src/or/main.c | 1 - src/or/or.h | 3 ++ 10 files changed, 137 insertions(+), 19 deletions(-)