[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1659'

[nickm at torproject.org]

commit 75741c6b3a2c180788a89a7eaca6d790e5d0606c
Merge: 1ba193b7a 8d288eb3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 14 12:40:07 2020 -0500

    Merge remote-tracking branch 'tor-github/pr/1659'

 changes/bug32942        | 4 ++++
 doc/tor.1.txt           | 3 ++-
 src/app/config/config.c | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)