Merge branch 'maint-0.3.4' into maint-0.3.5

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

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

diff --cc src/feature/relay/router.c
Simple merge