[tor-commits] [tor/master] Merge branch 'tor-github/pr/1002'

[asn@xxxxxxxxxxxxxx]

commit 338cfb31798267dc8260415ef55ddceb042367bd
Merge: 39a14421b 3c2648bbd
Author: George Kadianakis <desnacked@xxxxxxxxxx>
Date:   Wed May 15 23:23:18 2019 +0300

    Merge branch 'tor-github/pr/1002'

 changes/ticket30414                |   3 +
 src/app/main/shutdown.c            |  15 --
 src/app/main/subsystem_list.c      |   7 +-
 src/core/include.am                |   8 +
 src/core/mainloop/mainloop.c       | 288 ----------------------------------
 src/core/mainloop/mainloop.h       |   1 -
 src/core/or/circuitstats.c         |   2 +
 src/core/or/or_periodic.c          |  65 ++++++++
 src/core/or/or_periodic.h          |  17 ++
 src/core/or/or_sys.c               |  43 ++++++
 src/core/or/or_sys.h               |  17 ++
 src/feature/relay/relay_periodic.c | 308 +++++++++++++++++++++++++++++++++++++
 src/feature/relay/relay_periodic.h |  18 +++
 src/feature/relay/relay_sys.c      |  48 ++++++
 src/feature/relay/relay_sys.h      |  17 ++
 src/feature/relay/selftest.c       |   1 +
 16 files changed, 553 insertions(+), 305 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits