commit 5ec751b38b6ea5b40dece321a2c673c6b7e9cf01 Merge: a1192b6b4 11cf4d9c3 Author: George Kadianakis desnacked@riseup.net Date: Mon Sep 16 15:21:28 2019 +0300
Merge branch 'tor-github/pr/1324'
changes/ticket31637 | 6 + src/test/conf_examples/badnick_1/error | 1 + src/test/conf_examples/badnick_1/torrc | 2 + src/test/conf_examples/badnick_2/error | 1 + src/test/conf_examples/badnick_2/torrc | 2 + src/test/conf_examples/contactinfo_notutf8/error | 1 + src/test/conf_examples/contactinfo_notutf8/torrc | 1 + src/test/conf_examples/example_1/expected | 2 + src/test/conf_examples/example_1/torrc | 5 + src/test/conf_examples/example_2/error | 1 + src/test/conf_examples/example_2/torrc | 1 + src/test/conf_examples/example_3/cmdline | 1 + src/test/conf_examples/example_3/expected | 1 + src/test/conf_examples/example_3/torrc | 0 src/test/conf_examples/include_1/expected | 3 + src/test/conf_examples/include_1/included.inc | 4 + src/test/conf_examples/include_1/nested.inc | 2 + src/test/conf_examples/include_1/torrc | 4 + src/test/conf_examples/large_1/expected | 159 +++++++++++++++++++ src/test/conf_examples/large_1/torrc | 167 ++++++++++++++++++++ src/test/conf_examples/ops_1/cmdline | 1 + src/test/conf_examples/ops_1/expected | 2 + src/test/conf_examples/ops_1/torrc | 3 + src/test/conf_examples/ops_2/cmdline | 1 + src/test/conf_examples/ops_2/expected | 0 src/test/conf_examples/ops_2/torrc | 3 + src/test/conf_examples/ops_3/cmdline | 1 + src/test/conf_examples/ops_3/expected | 3 + src/test/conf_examples/ops_3/torrc | 3 + src/test/conf_examples/ops_4/expected | 2 + src/test/conf_examples/ops_4/torrc | 3 + src/test/conf_examples/ops_4/torrc.defaults | 1 + src/test/conf_examples/ops_5/expected | 3 + src/test/conf_examples/ops_5/torrc | 3 + src/test/conf_examples/ops_5/torrc.defaults | 1 + src/test/conf_examples/ops_6/expected | 0 src/test/conf_examples/ops_6/torrc | 3 + src/test/conf_examples/ops_6/torrc.defaults | 1 + src/test/conf_examples/relpath_rad/error | 1 + src/test/conf_examples/relpath_rad/torrc | 4 + src/test/include.am | 6 +- src/test/test_parseconf.sh | 190 +++++++++++++++++++++++ 42 files changed, 597 insertions(+), 2 deletions(-)