diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-10-23 11:47:40 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-10-23 11:47:40 -0400 |
commit | f43fe890dd7987811c1ce2b9d91404b27c965f6a (patch) | |
tree | cb48e0511fe9c43adf55fc20adf93627530cf3c3 /src/test/conf_examples/bug_31495_2/error | |
parent | 2908086694ee3822c8d3116952bec5a415387d75 (diff) | |
parent | bb9707420e87a1efc016aeac1e59edbfc6be3f87 (diff) | |
download | tor-f43fe890dd7987811c1ce2b9d91404b27c965f6a.tar.gz tor-f43fe890dd7987811c1ce2b9d91404b27c965f6a.zip |
Merge remote-tracking branch 'tor-gitlab/mr/127'
Diffstat (limited to 'src/test/conf_examples/bug_31495_2/error')
-rw-r--r-- | src/test/conf_examples/bug_31495_2/error | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/test/conf_examples/bug_31495_2/error b/src/test/conf_examples/bug_31495_2/error new file mode 100644 index 0000000000..1417806c60 --- /dev/null +++ b/src/test/conf_examples/bug_31495_2/error @@ -0,0 +1 @@ +Failed to parse/validate config: You cannot set both UseBridges and EntryNodes.
\ No newline at end of file |