commit 306d1fb60aaba4eb26be0ea467ddca078136112c Merge: 7097c4a37 3563a2c81 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Nov 6 10:05:22 2017 -0500 Merge remote-tracking branch 'atagar/manual' doc/tor.1.txt | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)