Merge branch 'bug2286_unit_test_squashed'

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

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

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

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