Merge branch 'maint-0.3.4'

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

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

diff --cc src/feature/dircache/dirserv.h
Simple merge

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