commit f8dc935fb7f2d5fb2a5ec4224c7d99f0f177608e Merge: 3c64cfe64 9b7cdd23d Author: Nick Mathewson <nickm@torproject.org> Date: Thu Apr 11 14:27:06 2019 -0400 Merge remote-tracking branch 'tor-github/pr/741' doc/tor.1.txt | 13 +++++++------ src/config/torrc.sample.in | 21 ++++++++++++++++----- 2 files changed, 23 insertions(+), 11 deletions(-)