Merge branch 'combined-fuzzing-v4'

diff --cc .gitignore
Simple merge

diff --cc configure.ac
Simple merge

diff --cc src/common/crypto.h
Simple merge

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

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