[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/47'

[dgoulet at torproject.org]

commit e594195aa2faa153e997f12dbcaebae4281ff925
Merge: 770e047c83 15860c8846
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jul 14 10:36:30 2020 -0400

    Merge branch 'tor-gitlab/mr/47'

 changes/ticket40043                                |   5 +
 src/core/or/channeltls.c                           |   4 +-
 src/core/or/connection_or.c                        |   5 +-
 src/core/or/policies.c                             | 136 ++++-------------
 src/core/or/policies.h                             |   8 +-
 src/feature/client/bridges.c                       |  95 ++++--------
 src/feature/dirauth/dirvote.c                      |  47 +++---
 src/feature/dirauth/process_descs.c                |  37 ++---
 src/feature/dirauth/reachability.c                 |   9 +-
 src/feature/dirclient/dir_server_st.h              |   6 +-
 src/feature/dirclient/dirclient.c                  |  16 +-
 src/feature/dirparse/authcert_parse.c              |   4 +-
 src/feature/dirparse/ns_parse.c                    |  18 +--
 src/feature/dirparse/routerparse.c                 |  11 +-
 src/feature/nodelist/authcert.c                    |  22 ++-
 src/feature/nodelist/authority_cert_st.h           |   6 +-
 src/feature/nodelist/describe.c                    |  67 ++++----
 src/feature/nodelist/describe.h                    |   4 +-
 src/feature/nodelist/dirlist.c                     |  72 ++++-----
 src/feature/nodelist/fmt_routerstatus.c            |   8 +-
 src/feature/nodelist/networkstatus.c               |  26 ++--
 src/feature/nodelist/networkstatus_voter_info_st.h |   6 +-
 src/feature/nodelist/node_select.c                 |  20 +--
 src/feature/nodelist/nodelist.c                    | 150 +++++++-----------
 src/feature/nodelist/nodelist.h                    |   5 +-
 src/feature/nodelist/routerinfo.c                  |   8 +-
 src/feature/nodelist/routerinfo_st.h               |   7 +-
 src/feature/nodelist/routerlist.c                  |   9 +-
 src/feature/nodelist/routerset.c                   |  12 +-
 src/feature/nodelist/routerstatus_st.h             |   6 +-
 src/feature/relay/relay_periodic.c                 |  32 ++--
 src/feature/relay/router.c                         |  17 ++-
 src/feature/relay/selftest.c                       |  10 +-
 src/feature/rend/rendservice.c                     |   4 +-
 src/lib/net/address.c                              |   9 ++
 src/lib/net/address.h                              |   1 +
 src/test/test_address.c                            |  18 +--
 src/test/test_address_set.c                        |   5 +-
 src/test/test_bridges.c                            |  12 +-
 src/test/test_bwmgt.c                              |   4 +-
 src/test/test_circuitbuild.c                       |  14 +-
 src/test/test_config.c                             | 168 ++++++++++-----------
 src/test/test_connection.c                         |   6 +-
 src/test/test_dir.c                                | 116 +++++++-------
 src/test/test_dir_common.c                         |  42 +++---
 src/test/test_dos.c                                |   2 +-
 src/test/test_entrynodes.c                         |  20 +--
 src/test/test_guardfraction.c                      |   6 +-
 src/test/test_hs_common.c                          |   6 +-
 src/test/test_hs_service.c                         |   6 +-
 src/test/test_nodelist.c                           |  49 +++---
 src/test/test_policy.c                             |  20 +--
 src/test/test_router.c                             |   4 +-
 src/test/test_routerlist.c                         |  42 +++---
 src/test/test_routerset.c                          |   4 +-
 src/test/test_voting_flags.c                       |  14 +-
 56 files changed, 645 insertions(+), 815 deletions(-)