[tor-commits] [tor/master] Merge branch 'tor-github/pr/1951'

[dgoulet at torproject.org]

commit 069566b40a94f8876e813fed39176bc403bfffd1
Merge: 374626c09 50abc06d8
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jun 25 13:41:45 2020 -0400

    Merge branch 'tor-github/pr/1951'

 changes/ticket33398     | 4 ++++
 doc/tor.1.txt           | 7 +++----
 src/app/config/config.c | 4 ----
 src/app/config/config.h | 3 +--
 src/app/main/main.c     | 6 ++++--
 5 files changed, 12 insertions(+), 12 deletions(-)