Merge remote-tracking branch 'public/spaces_in_unix_addrs'

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

diff --cc src/common/util.c
Simple merge

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

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