Merge commit 'sebastian/misc-reason'

diff --cc doc/spec/control-spec.txt
Simple merge

diff --cc doc/spec/tor-spec.txt
Simple merge

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

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

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