Merge branch 'tor-github/pr/994'

Signed-off-by: David Goulet <dgoulet@torproject.org>

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

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

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

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

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