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

[asn at torproject.org]

commit 0a86f14addd031ac69647f4ab6fc66c1835cd31e
Merge: 130eb227a 57ee0e3af
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon May 27 14:22:01 2019 +0300

    Merge branch 'tor-github/pr/1042'

 changes/ticket30580               | 4 ++++
 src/feature/control/control_cmd.c | 8 +++++---
 2 files changed, 9 insertions(+), 3 deletions(-)