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

[nickm at torproject.org]

commit 01af3a55f41de991c0b59d5bf12c100c82829b47
Merge: 4462766d3 2d651f4f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 11 11:57:31 2019 -0500

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

 src/test/conf_examples/empty_1/expected       | 0
 src/test/conf_examples/empty_1/torrc          | 0
 src/test/conf_examples/empty_2/cmdline        | 0
 src/test/conf_examples/empty_2/expected       | 0
 src/test/conf_examples/empty_2/torrc          | 0
 src/test/conf_examples/empty_2/torrc.defaults | 0
 src/test/conf_examples/empty_3/expected       | 0
 src/test/conf_examples/empty_3/included/empty | 0
 src/test/conf_examples/empty_3/torrc          | 1 +
 src/test/conf_examples/empty_4/error          | 1 +
 src/test/test_parseconf.sh                    | 5 +++++
 11 files changed, 7 insertions(+)