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

[nickm at torproject.org]

commit 183f89ccacdf7ca140f6d83345a9389e94119f5e
Merge: b0c1634ce c8859eb75
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 16 15:30:00 2019 -0500

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

 src/app/config/config.c | 4 ++--
 src/test/test_options.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)