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

[teor at torproject.org]

commit 11c8c4f23cc25371696030f03144f585f46f886e
Merge: e6bffeca6 616c0f823
Author: teor <teor at torproject.org>
Date:   Tue Dec 17 09:49:30 2019 +1000

    Merge branch 'pr1590_amended_commit'

 changes/ticket32708 |   3 +
 doc/tor.1.txt       | 918 ++++++++++++++++++++++++++--------------------------
 2 files changed, 458 insertions(+), 463 deletions(-)