[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/42'

[nickm@xxxxxxxxxxxxxx]

commit 6a647be54a8e88f94461f82e16b78a9113a1c351
Merge: 0c2bb9eac 401b3a8a3
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Jul 10 13:20:14 2020 -0400

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

 src/app/config/resolve_addr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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