Merge remote branch 'public/bug1859_021' into maint-0.2.1

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

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

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