commit f579541f13d5e196573a73065860337789a38504 Merge: dce1f63d4 1e8ddbe1e Author: David Goulet dgoulet@torproject.org Date: Wed Oct 30 08:53:51 2019 -0400

Merge branch 'tor-github/pr/1468'

changes/ticket32277 | 5 ++ doc/tor.1.txt | 214 +++++++++++++++++++++++++++++----------------------- 2 files changed, 123 insertions(+), 96 deletions(-)