[tor-commits] [tor/master] Merge branch 'ticket26947'

[nickm at torproject.org]

commit 159141a8c6e8ae6dc60110f897a931bf0a63e0b1
Merge: da4f4cb26 772106c6b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 8 18:07:32 2018 -0400

    Merge branch 'ticket26947'

 changes/ticket26947       |  3 +++
 src/feature/api/tor_api.c |  7 ++++++-
 src/feature/api/tor_api.h | 12 +++++++++++-
 src/tools/tor_runner.c    |  7 ++++++-
 4 files changed, 26 insertions(+), 3 deletions(-)