Merge branch 'feature2553-v4-rebased'

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

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

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

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

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

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

diff --cc src/or/or.h
Simple merge

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

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