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

[nickm at torproject.org]

commit f8e38d21c27f25af8bfacfda2dbd0160214361b3
Merge: 72751f0c3 27eec5052
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 5 11:57:20 2019 -0500

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

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