Merge remote-tracking branch 'asn/bug4312'

diff --cc src/common/compat_libevent.c
Simple merge

diff --cc src/common/tortls.c
Simple merge

diff --cc src/common/tortls.h
Simple merge

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