Merge remote-tracking branch 'public/gsoc-ctoader-cap-phase1-squashed'

diff --cc configure.ac
Simple merge

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

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

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

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