commit f43fe890dd7987811c1ce2b9d91404b27c965f6a Merge: 2908086694 bb9707420e Author: Nick Mathewson nickm@torproject.org Date: Fri Oct 23 11:47:40 2020 -0400

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

changes/feature28361 | 5 +++ doc/man/tor.1.txt | 25 +++++++++++- src/feature/nodelist/routerset.c | 45 ++++++++++++++++------ src/feature/nodelist/routerset.h | 4 ++ src/test/conf_examples/bug_31495_1/expected | 2 + src/test/conf_examples/bug_31495_1/expected_log | 1 + src/test/conf_examples/bug_31495_1/torrc | 2 + src/test/conf_examples/bug_31495_2/error | 1 + src/test/conf_examples/bug_31495_2/torrc | 3 ++ src/test/conf_examples/bug_31495_3/cmdline | 1 + src/test/conf_examples/bug_31495_3/expected | 2 + src/test/conf_examples/bug_31495_3/expected_log | 1 + src/test/conf_examples/bug_31495_3/torrc | 3 ++ .../conf_examples/multiple_routerset_1/expected | 1 + .../multiple_routerset_1/expected_log | 1 + src/test/conf_examples/multiple_routerset_1/torrc | 2 + .../conf_examples/multiple_routerset_2/cmdline | 1 + .../conf_examples/multiple_routerset_2/expected | 1 + .../multiple_routerset_2/expected_log | 1 + src/test/conf_examples/multiple_routerset_2/torrc | 2 + .../conf_examples/multiple_routerset_3/cmdline | 1 + .../conf_examples/multiple_routerset_3/expected | 1 + .../multiple_routerset_3/expected_log | 1 + src/test/conf_examples/multiple_routerset_3/torrc | 2 + .../conf_examples/multiple_routerset_4/cmdline | 1 + .../conf_examples/multiple_routerset_4/expected | 1 + .../multiple_routerset_4/expected_log | 1 + src/test/conf_examples/multiple_routerset_4/torrc | 3 ++ 28 files changed, 102 insertions(+), 13 deletions(-)