commit 82d758afa80724f4b8322e002d351c8e7923062a Merge: 3b960df4f 29d62987d Author: Nick Mathewson <nickm@torproject.org> Date: Tue Aug 28 15:24:30 2018 -0400 Merge remote-tracking branch 'tor-github/pr/279' doc/tor.1.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)