[tor-commits] [tor/master] Merge branch 'postloop_callbacks_2'

[nickm at torproject.org]

commit 61d87dfa1509aaf209ff72d7c5e091d06b191040
Merge: b152d62ce 4c03af488
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 13 12:12:46 2018 -0400

    Merge branch 'postloop_callbacks_2'

 changes/ticket25374             |   6 +++
 src/common/compat_libevent.c    | 115 +++++++++++++++++++++++++++++++++++++---
 src/common/compat_libevent.h    |   3 ++
 src/or/connection_edge.c        |  32 +++++++----
 src/or/main.c                   |  66 ++++++++++-------------
 src/or/main.h                   |   1 -
 src/test/test_compat_libevent.c |  60 +++++++++++++++++++++
 7 files changed, 227 insertions(+), 56 deletions(-)