aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-09-26 18:58:45 +0000
committerNick Mathewson <nickm@torproject.org>2008-09-26 18:58:45 +0000
commite147e867bea13515c964e823e3f98c28f90cf22c (patch)
treea8af8f882985c2edfa36f1eee2e44de17a6a4a80 /src/or/config.c
parent87eb230c01693c0cdb81d05a6bd2c866874c5e3a (diff)
downloadtor-e147e867bea13515c964e823e3f98c28f90cf22c.tar.gz
tor-e147e867bea13515c964e823e3f98c28f90cf22c.zip
Proposal 152 implementation from Josh Albrecht, with tweaks.
svn:r16983
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 219be16481..de1c6e0b3f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -136,6 +136,8 @@ static config_var_t _option_vars[] = {
V(Address, STRING, NULL),
V(AllowInvalidNodes, CSV, "middle,rendezvous"),
V(AllowNonRFC953Hostnames, BOOL, "0"),
+ V(AllowSingleHopCircuits, BOOL, "0"),
+ V(AllowSingleHopExits, BOOL, "0"),
V(AlternateBridgeAuthority, LINELIST, NULL),
V(AlternateDirAuthority, LINELIST, NULL),
V(AlternateHSAuthority, LINELIST, NULL),
@@ -198,6 +200,7 @@ static config_var_t _option_vars[] = {
V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "10 minutes"),
V(ExcludeNodes, ROUTERSET, NULL),
V(ExcludeExitNodes, ROUTERSET, NULL),
+ V(ExcludeSingleHopRelays, BOOL, "1"),
V(ExitNodes, ROUTERSET, NULL),
V(ExitPolicy, LINELIST, NULL),
V(ExitPolicyRejectPrivate, BOOL, "1"),