Merge branch 'bug1184'

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

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

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

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