Merge branch 'maint-0.2.9' into maint-0.3.0

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

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

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