commit 0402746a990a496ccd82708f5b676b4eca0521fa Merge: 7a7685955 8eadfad71 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 7 08:51:37 2019 -0500

Merge remote-tracking branch 'rl1987/doc28805'

changes/doc28805 | 4 ++++ doc/tor.1.txt | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)