Merge branch 'maint-0.2.7' into maint-0.2.8

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

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

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