diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-25 23:22:54 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-25 23:22:54 -0500 |
| commit | 265aab298ad923425e136013f6c439b5fba32558 (patch) | |
| tree | 89e923f121b91bdc4b7b4bf6f5f85d25e1b8d2a8 /src/or/config.c | |
| parent | 68dae4cf3563e536e0693648cefcd0c69e512bff (diff) | |
| parent | c2c6e8e5b2262ccbeeb3e3f954a9b52bc2096bd1 (diff) | |
| download | tor-265aab298ad923425e136013f6c439b5fba32558.tar tor-265aab298ad923425e136013f6c439b5fba32558.tar.gz | |
Merge branch 'directory_guards_rebased'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index b81edf749..db4e1bf90 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -308,6 +308,7 @@ static config_var_t option_vars_[] = { OBSOLETE("NoPublish"), VAR("NodeFamily", LINELIST, NodeFamilies, NULL), V(NumCPUs, UINT, "0"), + V(NumDirectoryGuards, UINT, "3"), V(NumEntryGuards, UINT, "3"), V(ORListenAddress, LINELIST, NULL), VPORT(ORPort, LINELIST, NULL), @@ -382,6 +383,7 @@ static config_var_t option_vars_[] = { V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), V(UseEntryGuards, BOOL, "1"), + V(UseEntryGuardsAsDirGuards, BOOL, "1"), V(UseMicrodescriptors, AUTOBOOL, "auto"), V(User, STRING, NULL), V(UserspaceIOCPBuffers, BOOL, "0"), |