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

[nickm at torproject.org]

commit d4d4a4b2dd95ce0cb8db6fc0074f0ac66d659469
Merge: c63d951e7 d02012413
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Dec 1 11:30:53 2018 -0500

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

 changes/bug28518        |  4 ++++
 src/app/config/config.c | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)