Merge remote-tracking branch 'public/bug12985_025'

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

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

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