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

[nickm at torproject.org]

commit 3eb9331133a0606e86114bb613f03c674050932d
Merge: 67fc69c8c1 d1413e04f8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 10 14:51:12 2020 -0400

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

 changes/ticket40039                   |  5 +++++
 src/feature/control/control_getinfo.c | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)