[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1801/head'

[nickm at torproject.org]

commit 80031db32abebaf4d0a91c01db258fcdbd54a471
Merge: 11fbd1f06 75aba30ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 9 11:50:20 2020 -0400

    Merge remote-tracking branch 'tor-github/pr/1801/head'

 changes/ticket33633                      |    6 +
 scripts/maint/practracker/exceptions.txt |   15 +-
 src/app/config/config.h                  |    2 +
 src/core/mainloop/cpuworker.c            |    2 +-
 src/core/or/channel.c                    |   37 +-
 src/core/or/channel.h                    |    7 +-
 src/core/or/circuitbuild.c               |  273 +-------
 src/core/or/circuitbuild.h               |   20 +-
 src/core/or/command.c                    |    1 +
 src/core/or/onion.c                      |    8 +-
 src/core/or/onion.h                      |    6 +-
 src/core/or/or.h                         |    2 -
 src/core/or/relay.c                      |    1 +
 src/feature/nodelist/nodelist.c          |   10 +-
 src/feature/nodelist/nodelist.h          |    8 +-
 src/feature/relay/circuitbuild_relay.c   |  399 +++++++++++
 src/feature/relay/circuitbuild_relay.h   |   84 +++
 src/feature/relay/include.am             |    2 +
 src/feature/relay/relay_config.c         |    2 +-
 src/feature/relay/selftest.c             |   34 +
 src/feature/relay/selftest.h             |   27 +-
 src/test/test_circuitbuild.c             | 1085 +++++++++++++++++++++++++++++-
 22 files changed, 1699 insertions(+), 332 deletions(-)