Merge branch 'maint-0.2.9' into maint-0.3.2

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

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