commit 1c5c3f353a0324bbc8b5df235999e04d2478c650 Merge: cdb065d6b 6c9d678ff Author: David Goulet <dgoulet@torproject.org> Date: Tue Oct 30 11:29:30 2018 -0400 Merge branch 'maint-0.3.5' changes/ticket28026 | 3 +++ doc/tor.1.txt | 34 ++++++++++++++++++++++------------ 2 files changed, 25 insertions(+), 12 deletions(-)