commit fd994f55c441922d3c5ae19ad5c254a1ae1eccfd Merge: 1e71e2c10 19f73f633 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 4 11:08:49 2018 -0400 Merge remote-tracking branch 'rl1987/doc26908' changes/doc26908 | 4 ++++ doc/tor.1.txt | 10 ++++++++-- src/config/torrc.minimal.in-staging | 4 ++++ src/config/torrc.sample.in | 4 ++++ 4 files changed, 20 insertions(+), 2 deletions(-)