commit f65f4b5c38bc79e2b3f1a10c21cedce9376ad87e Merge: 8ea090322 0c451b31d Author: teor <teor@torproject.org> Date: Mon Aug 12 09:49:53 2019 +1000 Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5 changes/bug30452 | 3 +++ doc/tor.1.txt | 4 ++++ src/app/config/config.c | 13 +++++++++++++ src/app/main/main.c | 1 + src/feature/dirauth/authmode.h | 4 ++++ 5 files changed, 25 insertions(+)