Merge branch 'tor_api_squashed'

diff --cc configure.ac
Simple merge

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

diff --cc src/or/include.am
Simple merge

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

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

diff --cc src/test/fuzz/fuzzing_common.c
Simple merge