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

[nickm at torproject.org]

commit 7d75e1dbdf9ab1fc0bbde086ca22a116de0216f4
Merge: 3989dd161 4413b030f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:52:32 2019 -0400

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

 changes/ticket32185     |  4 ++++
 src/app/config/config.c | 58 ++++++++++++++++++++++++++++---------------------
 2 files changed, 37 insertions(+), 25 deletions(-)