commit 3b704fd16667007d49223e1ae555eb7bd03092b3 Merge: bc2d935 8af0cfc Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 10 23:22:25 2011 -0400

Merge branch 'prop176-v2'

changes/prop176 | 8 + src/common/crypto.c | 97 ++++++++- src/common/crypto.h | 4 + src/common/tortls.c | 511 +++++++++++++++++++++++++++++++++++++-- src/common/tortls.h | 22 ++ src/or/buffers.c | 38 +++- src/or/command.c | 620 ++++++++++++++++++++++++++++++++++++++++++++++-- src/or/connection.c | 9 +- src/or/connection_or.c | 605 +++++++++++++++++++++++++++++++++++++++++------ src/or/connection_or.h | 25 ++ src/or/or.h | 120 ++++++++- src/test/test_crypto.c | 71 ++++++- 12 files changed, 1976 insertions(+), 154 deletions(-)