[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0

[nickm at torproject.org]

commit 04cb2d4010f131c970d0cf3ba56c9d752b8facb9
Merge: 2300a619a 9b7cdd23d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 16:14:51 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/741' into maint-0.4.0

 doc/tor.1.txt              | 13 +++++++------
 src/config/torrc.sample.in | 21 ++++++++++++++++-----
 2 files changed, 23 insertions(+), 11 deletions(-)