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

[asn at torproject.org]

commit 86f8dfe41955175c9125b699320bd28a07faae6a
Merge: 43c119fed 806539b40
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Apr 30 19:13:30 2019 +0300

    Merge branch 'tor-github/pr/983'

 changes/ticket30307                      |  4 ++
 changes/ticket30308                      |  5 +++
 scripts/maint/practracker/exceptions.txt |  2 +-
 src/core/or/circuitbuild.c               |  5 ++-
 src/core/or/circuitbuild.h               |  4 +-
 src/feature/client/bridges.c             |  2 +-
 src/feature/dirauth/voteflags.c          |  2 +-
 src/feature/nodelist/node_select.c       | 74 ++++++++++++++++++++++++++------
 src/feature/nodelist/nodelist.c          |  4 +-
 src/feature/nodelist/nodelist.h          |  2 +-
 src/feature/nodelist/routerset.c         |  2 +-
 src/test/test_circuitbuild.c             |  2 +-
 src/test/test_controller.c               |  2 +-
 src/test/test_entrynodes.c               |  3 +-
 src/test/test_helpers.c                  |  2 +-
 src/test/test_hs_common.c                |  2 +-
 src/test/test_routerset.c                |  8 ++--
 17 files changed, 91 insertions(+), 34 deletions(-)