commit b705cfa0247dda72ae7c8291be290316bd2392d1 Merge: b46942d37f dcf5753a83 Author: George Kadianakis desnacked@riseup.net Date: Tue Aug 11 15:12:43 2020 +0300

Merge remote-tracking branch 'tor-gitlab/mr/111'

changes/ticket18106 | 3 + src/app/config/or_options_st.h | 4 +- src/core/mainloop/connection.c | 12 +-- src/core/or/extendinfo.c | 2 +- src/core/or/policies.c | 140 +++++++++++++-------------- src/core/or/policies.h | 26 ++--- src/feature/client/bridges.c | 8 +- src/feature/client/entrynodes.c | 4 +- src/feature/dirclient/dirclient.c | 12 +-- src/feature/hs/hs_common.c | 4 +- src/feature/nodelist/authcert.c | 2 +- src/feature/nodelist/node_select.c | 14 +-- src/feature/nodelist/nodelist.c | 16 ++-- src/feature/nodelist/routerlist.c | 4 +- src/feature/rend/rendservice.c | 6 +- src/test/test_entrynodes.c | 2 +- src/test/test_policy.c | 190 ++++++++++++++++++------------------- 17 files changed, 226 insertions(+), 223 deletions(-)