Merge branch 'bug18809_028_squashed' into maint-0.2.8

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

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

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

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