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

[nickm at torproject.org]

commit 05a05773f284dd870282e05ae918d74300ddbc19
Merge: 5e6021bda cb757b30a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 10 10:23:50 2020 -0500

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

 changes/ticket32928 |   7 +
 doc/tor.1.txt       | 628 +++++++++++++++++++++++++++-------------------------
 2 files changed, 333 insertions(+), 302 deletions(-)