commit a57e168caa21f9798be85adb56af726da7385810 Merge: 5df0b3662 9b7cdd23d Author: teor teor@torproject.org Date: Mon Aug 12 09:36:14 2019 +1000

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

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