commit 5687165cf1aec8e3b7356ab842624d36f56318fc Merge: d043096d5 58cbe5170 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 13 11:38:35 2019 -0500 Merge remote-tracking branch 'tor-github/pr/674' changes/doc28623 | 3 +++ doc/tor.1.txt | 13 +++++++------ 2 files changed, 10 insertions(+), 6 deletions(-)