[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket25762_034_05'

[nickm at torproject.org]

commit 192c7c8bf9a3c53d32e83557ebc62cf7cfa3b1ca
Merge: 3527f4b8a 665e23c59
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 23 11:02:05 2018 -0400

    Merge remote-tracking branch 'dgoulet/ticket25762_034_05'

 src/or/config.c                |   7 +-
 src/or/main.c                  | 192 ++++++++++++++++++++++---------
 src/or/main.h                  |   7 ++
 src/or/networkstatus.c         |   2 +-
 src/or/networkstatus.h         |   2 +
 src/or/periodic.c              |  51 +++++++-
 src/or/periodic.h              |  42 ++++++-
 src/test/include.am            |   1 +
 src/test/test.c                |   1 +
 src/test/test.h                |   1 +
 src/test/test_periodic_event.c | 256 +++++++++++++++++++++++++++++++++++++++++
 11 files changed, 502 insertions(+), 60 deletions(-)