Merge branch 'maint-0.2.9'

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

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

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

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