Merge remote-tracking branch 'juga/ticket3723_03_squashed_rebased'

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/feature/nodelist/networkstatus.c
Simple merge

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