Merge remote-tracking branch 'origin/maint-0.2.4'

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

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

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