Merge branch 'maint-0.2.8' into maint-0.2.9

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

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

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