commit e07206afea28d110a0a7b74d4e230db3b0fe3120 Merge: 5474d8a cae4483 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Sep 10 23:41:55 2014 -0400 Merge remote-tracking branch 'yawning/bug_8402' changes/bug8402 | 5 +++ src/or/config.c | 13 ++++-- src/or/connection.c | 42 +++++++++++-------- src/or/transports.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/transports.h | 6 +++ src/test/test_pt.c | 81 ++++++++++++++++++++++++++++++++++++ 6 files changed, 238 insertions(+), 24 deletions(-)