Conflicts:
	src/feature/dirparse/authcert_parse.c
	src/feature/dirparse/ns_parse.c
	src/feature/hs/hs_service.c
	src/lib/conf/conftesting.h
	src/lib/log/log.h
	src/lib/thread/threads.h
	src/test/test_options.c

These conflicts were mostly related to autostyle improvements, with
one or two due to doxygen fixes.

(These ones cause parsing failures.)

Coccinelle doesn't understand the particular pattern of token
pasting we have going on here.

This will let us give specific in-file equivalents to given macros
or preprocessor directives, to make things parse.