[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug12985_024' into bug12984_025

[nickm at torproject.org]

commit b0138cd05540001f084b7bd828b3dcffbaeb5b22
Merge: 37a76d7 b82e166
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 29 12:24:52 2014 -0400

    Merge remote-tracking branch 'public/bug12985_024' into bug12984_025

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