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

[nickm at torproject.org]

commit 98b694bfd5a8577949a48b09cc995a2ea73bb884
Merge: 0b0e4886c 421c2310a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Apr 6 08:50:35 2018 -0400

    Merge branch 'isolate_libevent_2_squashed'

 changes/isolate_libevent        |   5 ++
 src/common/compat_libevent.c    | 147 ++++++++++++++++++++++++++++++++++++++++
 src/common/compat_libevent.h    |  22 ++++--
 src/common/procmon.c            |  27 +++-----
 src/common/timers.c             |  18 ++---
 src/common/workqueue.c          |  47 +++++++++++--
 src/common/workqueue.h          |   5 +-
 src/or/channelpadding.c         |   1 -
 src/or/control.c                |  20 +++---
 src/or/cpuworker.c              |  25 ++-----
 src/or/main.c                   |  22 +++---
 src/or/ntmain.c                 |   5 +-
 src/or/periodic.c               |  21 +++---
 src/or/periodic.h               |   5 +-
 src/or/scheduler.c              |  25 +++----
 src/or/scheduler.h              |   4 +-
 src/or/scheduler_kist.c         |   4 +-
 src/or/scheduler_vanilla.c      |   4 +-
 src/test/test-timers.c          |   6 +-
 src/test/test_channelpadding.c  |  16 ++---
 src/test/test_compat_libevent.c |   1 -
 src/test/test_helpers.c         |   2 +-
 src/test/test_scheduler.c       |  75 +-------------------
 src/test/test_workqueue.c       |  35 ++++------
 24 files changed, 306 insertions(+), 236 deletions(-)