commit dca2c00aca4209b8b810e2b86d540757b47eed82 Merge: 4dd594d33 5164709f9 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 19 11:39:05 2020 -0500 Merge remote-tracking branch 'tor-github/pr/1755/head' changes/ticket33275 | 5 + doc/tor.1.txt | 593 +++++++++++++++++++++++++++------------------------- 2 files changed, 308 insertions(+), 290 deletions(-)