Merge branch 'maint-0.3.5' into maint-0.4.3

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

diff --cc src/feature/nodelist/nodelist.c
Simple merge

diff --cc src/feature/nodelist/nodelist.h
Simple merge

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