commit f0f2fab5e16cadf37938b48a47c062e539eef9c0 Merge: 6bc324c96 c1cfa0fbc Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 13 11:02:34 2018 -0400 Merge remote-tracking branch 'ffmancera-1/bug23635' into maint-0.3.3 changes/ticket23635 | 3 +++ doc/tor.1.txt | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-)