commit 4f68fe3e6c09881af46bfedadfdcd892b026adf3 Merge: a9b287fbcc 43a725797b Author: George Kadianakis <desnacked@riseup.net> Date: Wed Jul 28 12:00:37 2021 +0300 Merge branch 'vanguards-lite-dev-rebased' changes/ticket40363 | 9 ++ doc/man/tor.1.txt | 7 + src/app/config/config.c | 1 + src/app/config/or_options_st.h | 3 + src/core/mainloop/mainloop.c | 20 +++ src/core/or/circuitbuild.c | 40 +++--- src/core/or/circuituse.c | 48 ++----- src/feature/client/entrynodes.c | 258 +++++++++++++++++++++++++++++++++++ src/feature/client/entrynodes.h | 5 + src/feature/nodelist/networkstatus.c | 3 + src/test/test_circuitbuild.c | 2 +- src/test/test_entrynodes.c | 40 ++++++ 12 files changed, 383 insertions(+), 53 deletions(-)