[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1750/head'

[nickm@xxxxxxxxxxxxxx]

commit 11adf0f46f88bc07c0c080b3b8f1725b0ad382c6
Merge: c9bd3579f 84f2e2820
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Feb 25 12:58:23 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1750/head'

 changes/ticket32720                     |  4 +++
 src/core/or/status.c                    |  3 ++
 src/feature/control/control_bootstrap.c |  6 ++++
 src/feature/control/control_events.h    |  1 +
 src/feature/dirclient/dirclient.c       | 49 +++++++++++++++++++++++++++++++++
 src/feature/dirclient/dirclient.h       |  2 ++
 6 files changed, 65 insertions(+)

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