[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket32822_045_01'

[nickm@xxxxxxxxxxxxxx]

commit 20d1a1cdbd9d4a3d21e80c62027522505731189a
Merge: 9b560ea71 82010b0e2
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jul 2 09:47:43 2020 -0400

    Merge remote-tracking branch 'dgoulet/ticket32822_045_01'

 changes/ticket32822                                     |  5 +++++
 src/feature/nodelist/dirlist.c                          |  2 +-
 src/feature/relay/router.c                              |  4 +++-
 src/test/conf_examples/dirauth_3/error_no_dirauth       |  1 +
 src/test/conf_examples/dirauth_3/error_no_dirauth_relay |  1 +
 src/test/conf_examples/dirauth_3/expected               |  9 +++++++++
 src/test/conf_examples/dirauth_3/expected_log           |  1 +
 src/test/conf_examples/dirauth_3/torrc                  | 13 +++++++++++++
 8 files changed, 34 insertions(+), 2 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits