Merge branch 'tor-github/pr/1276'

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

diff --cc src/feature/dirauth/process_descs.h
Simple merge

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

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

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