[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.4.5' into release-0.4.5

[dgoulet@xxxxxxxxxxxxxx]

commit 36212ad953463167cfceafc1f43c84a356a6bd19
Merge: 83e448dd4d 6ea7eb58c6
Author: David Goulet <dgoulet@xxxxxxxxxxxxxx>
Date:   Wed Feb 24 13:55:29 2021 -0500

    Merge branch 'maint-0.4.5' into release-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(-)



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