Merge branch 'tor-gitlab/mr/285' into ticket2667_044_01

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

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

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

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