aboutsummaryrefslogtreecommitdiff
path: root/src/test/conf_examples/relay_27
diff options
context:
space:
mode:
authorteor <teor@torproject.org>2019-11-05 14:23:10 +1000
committerteor <teor@torproject.org>2019-11-05 14:23:10 +1000
commit61694695469824f5daf5155d5f072dd97be22c32 (patch)
tree6d09e71c4ca8f3db5914d5e6b1ec3e37e3e62f95 /src/test/conf_examples/relay_27
parentd3af23783c35151a511fc7fc37d88cf41831448c (diff)
parentbcb38d984d42a75832db9fc8f3b70d54dce472e4 (diff)
downloadtor-61694695469824f5daf5155d5f072dd97be22c32.tar.gz
tor-61694695469824f5daf5155d5f072dd97be22c32.zip
Merge remote-tracking branch 'tor-github/pr/1477'
Diffstat (limited to 'src/test/conf_examples/relay_27')
-rw-r--r--src/test/conf_examples/relay_27/error1
-rw-r--r--src/test/conf_examples/relay_27/error_no_dirauth_relay1
-rw-r--r--src/test/conf_examples/relay_27/torrc5
3 files changed, 7 insertions, 0 deletions
diff --git a/src/test/conf_examples/relay_27/error b/src/test/conf_examples/relay_27/error
new file mode 100644
index 0000000000..e26ce46914
--- /dev/null
+++ b/src/test/conf_examples/relay_27/error
@@ -0,0 +1 @@
+Relays cannot set ReducedCircuitPadding
diff --git a/src/test/conf_examples/relay_27/error_no_dirauth_relay b/src/test/conf_examples/relay_27/error_no_dirauth_relay
new file mode 100644
index 0000000000..9f9c0fd8f3
--- /dev/null
+++ b/src/test/conf_examples/relay_27/error_no_dirauth_relay
@@ -0,0 +1 @@
+This tor was built with relay mode disabled.
diff --git a/src/test/conf_examples/relay_27/torrc b/src/test/conf_examples/relay_27/torrc
new file mode 100644
index 0000000000..8556b2f351
--- /dev/null
+++ b/src/test/conf_examples/relay_27/torrc
@@ -0,0 +1,5 @@
+# Relay tests
+# Options from relay/relay_config.c
+# Relays can't set ReducedCircuitPadding 1
+ORPort 1
+ReducedCircuitPadding 1