commit 4d8de6c6be53bd881755b19dfece563953340cc8 Merge: 2d6914e39 21b347e29 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Apr 13 13:09:11 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket25248_033_02' into maint-0.3.3 changes/ticket25248 | 4 + doc/tor.1.txt | 225 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 134 insertions(+), 95 deletions(-)