[tor-commits] [tor/master] Merge branch 'tor-gitlab/mr/321' into maint-0.4.5

[dgoulet at torproject.org]

commit 6ea7eb58c697d9e02090f63687803e921bc7c13f
Merge: 97e51dd01b 39d0f69dfe
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 24 13:55:21 2021 -0500

    Merge branch 'tor-gitlab/mr/321' into maint-0.4.5

 changes/ticket40300                     |  5 ++++-
 src/feature/dirclient/dirclient_modes.c |  8 --------
 src/feature/relay/relay_find_addr.c     | 15 ++-------------
 src/feature/relay/relay_find_addr.h     |  2 --
 src/test/test_config.c                  | 21 ---------------------
 5 files changed, 6 insertions(+), 45 deletions(-)