Merge remote-tracking branch 'public/unused_stuff' into maint-0.2.4

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

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

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