Merge branch 'maint-0.2.8'

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

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

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

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

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

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

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