Merge branch 'more_directories_squashed'

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

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

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

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

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

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

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

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

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