commit e97eb6f2546e6892e1ace8472f99ff20d10df995 Merge: a21c4c6 2a594fc Author: Nick Mathewson nickm@torproject.org Date: Mon Jul 11 16:16:11 2011 -0400

Merge branch 'feature3116_squashed'

changes/feature3116 | 5 + changes/split_about_to_close | 3 + src/common/tortls.c | 34 ++++++++ src/common/tortls.h | 1 + src/or/circuitbuild.c | 1 + src/or/connection.c | 109 +++----------------------- src/or/connection_edge.c | 65 +++++++++++++++ src/or/connection_edge.h | 3 + src/or/connection_or.c | 176 ++++++++++++++++++++++++++++++++++++++++++ src/or/connection_or.h | 4 + src/or/control.c | 9 ++- src/or/directory.c | 24 ++++++- src/or/directory.h | 2 +- 13 files changed, 334 insertions(+), 102 deletions(-)