commit fefee871a6f19418bd4cd97654087e73b02acd13 Merge: cf5f52d69 97e8a0508 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 24 11:44:19 2019 -0400

Merge remote-tracking branch 'tor-github/pr/1437'

changes/ticket32176 | 4 + doc/tor.1.txt | 308 +++++++++++++++++++++++++--------------------------- 2 files changed, 154 insertions(+), 158 deletions(-)