commit b6d9484fa7ab3770d988d2ad488667c3455caf80 Merge: d4d5d9d1d 7160a7218 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 24 08:06:42 2020 -0500

Merge remote-tracking branch 'tor-github/pr/1761/head'

changes/ticket33369 | 4 +++ doc/tor.1.txt | 89 +++++++++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 43 deletions(-)