commit 1da0b05a5cace6ed05244e3e2c12e4babd4641fa Merge: a63b41482 ef991b04e Author: David Goulet dgoulet@torproject.org Date: Thu Mar 5 10:52:59 2020 -0500

Merge commit 'ef991b04e26eb4db'

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