commit c34a6b922f3e5ff22c99c70bfe3832b647ce5b49 Merge: 6afe1b00c 362afa8c4 Author: David Goulet dgoulet@torproject.org Date: Thu Jun 27 10:19:45 2019 -0400

Merge branch 'tor-github/pr/1129'

changes/ticket30955 | 3 +++ doc/tor.1.txt | 45 +++++++++++++++++++++++++-------------------- 2 files changed, 28 insertions(+), 20 deletions(-)