[tor-commits] [tor/master] Merge branch 'tor-github/pr/1861'

[asn at torproject.org]

commit fb281daf293f791999e3b1ead0f6dd77afd10eb1
Merge: ca13249dc 8e59b8560
Author: George Kadianakis <desnacked at riseup.net>
Date:   Thu May 21 16:22:47 2020 +0300

    Merge branch 'tor-github/pr/1861'

 changes/ticket32873                   |  6 ++++++
 src/feature/control/control_getinfo.c | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)