Merge remote-tracking branch 'public/bug3940_redux'

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

diff --cc src/or/connection_edge.h
Simple merge

diff --cc src/or/or.h
Simple merge

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

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

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