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

[dgoulet at torproject.org]

commit 064e23e95c8d0d0fb762e1cb7699c4bd4c75ecb8
Merge: b0a716dfb c5707d6cf
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jul 2 14:18:00 2020 -0400

    Merge branch 'tor-github/pr/1968'

 scripts/maint/practracker/exceptions.txt |   1 +
 src/core/crypto/onion_crypto.c           |   2 +-
 src/core/or/channeltls.c                 |   8 +-
 src/core/or/circuitbuild.c               | 276 +++++-----------------------
 src/core/or/circuitbuild.h               |  23 +--
 src/core/or/circuitlist.c                |   1 +
 src/core/or/circuituse.c                 |   5 +-
 src/core/or/connection_edge.c            |   5 +-
 src/core/or/crypt_path.c                 |   2 +-
 src/core/or/extend_info_st.h             |  16 +-
 src/core/or/extendinfo.c                 | 305 +++++++++++++++++++++++++++++++
 src/core/or/extendinfo.h                 |  40 ++++
 src/core/or/include.am                   |   2 +
 src/core/or/onion.h                      |   3 +-
 src/core/or/relay.c                      |   1 +
 src/feature/client/bridges.c             |  18 +-
 src/feature/control/control_cmd.c        |   1 +
 src/feature/hs/hs_circuit.c              |   1 +
 src/feature/hs/hs_client.c               |   1 +
 src/feature/hs/hs_common.c               |   1 +
 src/feature/hs/hs_service.c              |   1 +
 src/feature/nodelist/describe.c          |  10 +-
 src/feature/nodelist/routerset.c         |  19 +-
 src/feature/relay/circuitbuild_relay.c   |   7 +-
 src/feature/relay/selftest.c             |   6 +-
 src/feature/rend/rendclient.c            |  11 +-
 src/feature/rend/rendcommon.c            |  10 +-
 src/feature/rend/rendparse.c             |  17 +-
 src/feature/rend/rendservice.c           |  17 +-
 src/lib/net/address.h                    |  10 +
 src/test/rend_test_helpers.c             |  13 +-
 src/test/test.c                          |  21 ++-
 src/test/test_circuitbuild.c             |  20 +-
 src/test/test_circuitpadding.c           |   1 +
 src/test/test_hs_client.c                |   6 +-
 src/test/test_nodelist.c                 |   4 +-
 src/test/test_policy.c                   |   5 +-
 37 files changed, 559 insertions(+), 331 deletions(-)