Merge remote-tracking branch 'tor-github/pr/508'

diff --cc Makefile.am
Simple merge

diff --cc src/app/main/main.c
Simple merge

diff --cc src/core/mainloop/connection.c
Simple merge

diff --cc src/core/mainloop/mainloop.c
Simple merge

diff --cc src/core/or/connection_edge.c
Simple merge

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

diff --cc src/feature/control/control.c
Simple merge