Merge branch 'maint-0.2.8'

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

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

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

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