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

[nickm at torproject.org]

commit c8c64caf371c2960bf217fc10d2353144e7e24b3
Merge: 2aa441b88 8cfab3b7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 6 17:16:37 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/923'

 changes/bug30109 |  3 +++
 doc/tor.1.txt    | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)