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

[dgoulet at torproject.org]

commit 39a14421b1f50b4bea8c42e4f76a67b648bfa8e0
Merge: d71fa707d b9f50a2d7
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed May 15 15:35:22 2019 -0400

    Merge branch 'tor-github/pr/1021'
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>

 changes/bug30452                         |  3 +++
 doc/tor.1.txt                            |  4 ++++
 scripts/maint/practracker/exceptions.txt |  6 +++---
 src/app/config/config.c                  | 13 +++++++++++++
 src/app/main/main.c                      |  1 +
 src/feature/dirauth/authmode.h           |  4 ++++
 6 files changed, 28 insertions(+), 3 deletions(-)