Merge branch 'maint-0.3.3'

diff --cc src/or/networkstatus.c
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