Merge branch 'clang_format_prep_3'

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

diff --cc src/core/or/circuitmux.c
Simple merge

diff --cc src/core/or/connection_or.c
Simple merge

diff --cc src/core/or/scheduler_kist.c
Simple merge

diff --cc src/feature/control/control_events.h
Simple merge

diff --cc src/feature/dirauth/dirvote.c
Simple merge

diff --cc src/feature/dirauth/shared_random_state.c
Simple merge

diff --cc src/feature/dirclient/dirclient.c
Simple merge

diff --cc src/feature/hs/hs_service.c
Simple merge

diff --cc src/feature/nodelist/nodelist.c
Simple merge

diff --cc src/feature/relay/dns.c
Simple merge

diff --cc src/feature/stats/rephist.c
Simple merge

diff --cc src/lib/cc/compat_compiler.h
Simple merge

diff --cc src/lib/ctime/di_ops.c
Simple merge

diff --cc src/test/test_dir.c
Simple merge

diff --cc src/test/test_util.c
Simple merge