commit a2caa466eed1715603ece5bd7e74536f834e075e Merge: 7fcae5bff 29e98d16d Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 19 13:36:43 2017 -0400 Merge branch 'ticket21405' changes/ticket21405 | 3 +++ doc/tor.1.txt | 40 ++++++++++++++++++++++++---------------- 2 files changed, 27 insertions(+), 16 deletions(-)