[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12985_025'

[nickm at torproject.org]

commit 1abd526c75eade83318a6ec6aff84d5f0f079a3b
Merge: 7dd8528 139a1c6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 7 11:55:50 2015 -0500

    Merge remote-tracking branch 'public/bug12985_025'

 changes/bug12985             |    5 +++++
 src/common/compat_libevent.c |   14 +++++++++++++-
 src/common/compat_libevent.h |    5 ++---
 src/or/connection.c          |    6 ++++--
 4 files changed, 24 insertions(+), 6 deletions(-)