Merge branch 'maint-0.2.8'

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

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

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

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

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

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

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

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