Merge branch 'maint-0.3.0' into maint-0.3.1

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

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

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

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

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

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