Merge remote-tracking branch 'public/bug3940_redux'

changes/bug3940_redux

src/or/connection_edge.c

src/or/connection_edge.h

src/or/or.h

src/or/relay.c

src/test/test.c

src/test/test_config.c