Merge remote-tracking branch 'yawning/bug_8402'

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection.c
Simple merge

diff --cc src/test/test_pt.c
Simple merge