Merge remote-tracking branch 'origin/maint-0.2.3'

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

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