commit fabc3deb7570837f0969f8023c6927900263d313 Merge: 96cf608b2 a437080d3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 3 10:11:44 2017 -0400 Merge branch 'bug20152' changes/doc20152 | 3 +++ doc/tor.1.txt | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-)