aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/bug_31495_3
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-10-23 11:47:40 -0400
committerNick Mathewson <nickm@torproject.org>2020-10-23 11:47:40 -0400
commitf43fe890dd7987811c1ce2b9d91404b27c965f6a (patch)
treecb48e0511fe9c43adf55fc20adf93627530cf3c3 /src/test/conf_examples/bug_31495_3
parent2908086694ee3822c8d3116952bec5a415387d75 (diff)
parentbb9707420e87a1efc016aeac1e59edbfc6be3f87 (diff)
downloadtor-f43fe890dd7987811c1ce2b9d91404b27c965f6a.tar.gz
tor-f43fe890dd7987811c1ce2b9d91404b27c965f6a.zip
Merge remote-tracking branch 'tor-gitlab/mr/127'
Diffstat (limited to 'src/test/conf_examples/bug_31495_3')
-rw-r--r--src/test/conf_examples/bug_31495_3/cmdline1
-rw-r--r--src/test/conf_examples/bug_31495_3/expected2
-rw-r--r--src/test/conf_examples/bug_31495_3/expected_log1
-rw-r--r--src/test/conf_examples/bug_31495_3/torrc3
4 files changed, 7 insertions, 0 deletions
diff --git a/src/test/conf_examples/bug_31495_3/cmdline b/src/test/conf_examples/bug_31495_3/cmdline
new file mode 100644
index 0000000000..478c1abe74
--- /dev/null
+++ b/src/test/conf_examples/bug_31495_3/cmdline
@@ -0,0 +1 @@
+/EntryNodes \ No newline at end of file
diff --git a/src/test/conf_examples/bug_31495_3/expected b/src/test/conf_examples/bug_31495_3/expected
new file mode 100644
index 0000000000..246347b668
--- /dev/null
+++ b/src/test/conf_examples/bug_31495_3/expected
@@ -0,0 +1,2 @@
+Bridge 127.0.0.1:9050
+UseBridges 1
diff --git a/src/test/conf_examples/bug_31495_3/expected_log b/src/test/conf_examples/bug_31495_3/expected_log
new file mode 100644
index 0000000000..a4b98345d6
--- /dev/null
+++ b/src/test/conf_examples/bug_31495_3/expected_log
@@ -0,0 +1 @@
+Configuration was valid \ No newline at end of file
diff --git a/src/test/conf_examples/bug_31495_3/torrc b/src/test/conf_examples/bug_31495_3/torrc
new file mode 100644
index 0000000000..f629fff673
--- /dev/null
+++ b/src/test/conf_examples/bug_31495_3/torrc
@@ -0,0 +1,3 @@
+UseBridges 1
+Bridge 127.0.0.1:9050
+EntryNodes 127.0.0.1 \ No newline at end of file