[tor-commits] [tor/master] Merge branch 'maint-0.4.5'

[dgoulet at torproject.org]

commit f75baf5ea53025dfd371f392ccfb685e9964b11e
Merge: 830b0f8c62 6ea7eb58c6
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Feb 24 13:55:30 2021 -0500

    Merge branch '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(-)