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

[nickm at torproject.org]

commit 9399c579e5a4dbff5595bb6f102c9c9cba504a22
Merge: 9b0a17a74 c7ce6b982
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 21 09:37:23 2018 -0400

    Merge branch 'split_mainloop_onion'

 src/app/config/config.c                  |    4 +-
 src/app/config/statefile.c               |    2 +-
 src/app/main/main.c                      | 1515 +++++++++++++++++++++++++++++
 src/app/main/main.h                      |   29 +
 src/app/main/ntmain.c                    |    2 +-
 src/core/crypto/onion_crypto.c           |  311 ++++++
 src/core/crypto/onion_crypto.h           |   47 +
 src/core/include.am                      |   14 +-
 src/core/mainloop/connection.c           |    2 +-
 src/core/mainloop/cpuworker.c            |    5 +-
 src/core/mainloop/{main.c => mainloop.c} | 1517 +-----------------------------
 src/core/mainloop/{main.h => mainloop.h} |   34 +-
 src/core/mainloop/periodic.c             |    2 +-
 src/core/or/channel.c                    |    2 +-
 src/core/or/channelpadding.c             |    2 +-
 src/core/or/circuitbuild.c               |    5 +-
 src/core/or/circuitlist.c                |    5 +-
 src/core/or/circuitstats.c               |    2 +-
 src/core/or/command.c                    |    4 +-
 src/core/or/connection_edge.c            |    2 +-
 src/core/or/connection_or.c              |    2 +-
 src/core/or/dos.c                        |    2 +-
 src/core/{crypto => or}/onion.c          |  636 +------------
 src/core/{crypto => or}/onion.h          |   38 -
 src/core/or/relay.c                      |    4 +-
 src/core/or/scheduler.c                  |    2 +-
 src/core/or/status.c                     |    2 +-
 src/feature/client/dnsserv.c             |    2 +-
 src/feature/client/entrynodes.c          |    2 +-
 src/feature/control/control.c            |    3 +-
 src/feature/dirauth/voteflags.c          |    2 +-
 src/feature/dircache/directory.c         |    2 +-
 src/feature/hibernate/hibernate.c        |    2 +-
 src/feature/hs/hs_service.c              |    2 +-
 src/feature/nodelist/authcert.c          |    2 +-
 src/feature/nodelist/fmt_routerstatus.c  |    2 +-
 src/feature/nodelist/networkstatus.c     |    2 +-
 src/feature/nodelist/nodelist.c          |    2 +-
 src/feature/nodelist/routerlist.c        |    2 +-
 src/feature/relay/dns.c                  |    2 +-
 src/feature/relay/ext_orport.c           |    2 +-
 src/feature/relay/onion_queue.c          |  361 +++++++
 src/feature/relay/onion_queue.h          |   23 +
 src/feature/relay/router.c               |    3 +-
 src/feature/rend/rendclient.c            |    2 +-
 src/feature/rend/rendservice.c           |    2 +-
 src/test/test.c                          |    8 +-
 src/test/test_cell_formats.c             |    2 +-
 src/test/test_channelpadding.c           |    4 +-
 src/test/test_config.c                   |    2 +-
 src/test/test_connection.c               |    4 +-
 src/test/test_extorport.c                |    6 +-
 src/test/test_helpers.c                  |    6 +-
 src/test/test_hs_client.c                |    4 +-
 src/test/test_hs_service.c               |    4 +-
 src/test/test_mainloop.c                 |    2 +-
 src/test/test_oos.c                      |    2 +-
 src/test/test_options.c                  |    2 +-
 src/test/test_periodic_event.c           |    4 +-
 src/test/test_relaycell.c                |    2 +-
 src/test/test_router.c                   |    2 +-
 src/test/test_status.c                   |    2 +-
 src/test/test_workqueue.c                |    2 +-
 src/test/testing_common.c                |    4 +-
 src/tools/tor-print-ed-signing-cert.c    |    2 +-
 65 files changed, 2437 insertions(+), 2239 deletions(-)