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

src/test/conf_examples/empty_3/torrc

@@ -0,0 +1 @@
+%include "included"

src/test/conf_examples/empty_4/error

@@ -0,0 +1 @@
+Unable to open configuration file

src/test/test_parseconf.sh

@@ -28,6 +28,11 @@
 # cmdline -- Optional. If present, it contains command-line arguments that
 #      will be passed to Tor.
 #
+# (included torrc files or directories) -- Optional. If present, and
+#      configured in the torrc* or cmdline, these files or directories are
+#      included. Include paths should be specified relative to the test case
+#      directory.
+#
 # expected -- If this file is present, then it should be the expected result
 #      of "--dump-config short" for this test case.  Exactly one of
 #      "expected" or "error" must be present, or the test will fail.