Merge remote-tracking branch 'dgoulet/bug14391_026_v2'

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

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

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