Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4

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

diff --cc src/or/dirserv.h
Simple merge

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

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