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

[dgoulet at torproject.org]

commit 1f60337da4bc1b813489482d9001285e9b104d3d
Merge: 7a26f14a3 6581f3e2f
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Oct 8 14:49:39 2019 -0400

    Merge branch 'tor-github/pr/1381'

 changes/ticket31189 | 3 +++
 doc/tor.1.txt       | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)