Merge branch 'maint-0.3.5'

diff --cc doc/tor.1.txt
Simple merge

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

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