diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-03 11:52:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-03 11:52:41 -0500 |
| commit | b1bdecd703879ca09bf63bf1453a70c4b80ac96d (patch) | |
| tree | 9fd512361cae60d0aec849e52e349cc1a67f8055 /src/or/config.c | |
| parent | ee4182612f7f06ae09531bf75e9b84ea30871278 (diff) | |
| parent | d3de0b91fb322c00d11857d89a8420af0d466e39 (diff) | |
| download | tor-b1bdecd703879ca09bf63bf1453a70c4b80ac96d.tar.gz tor-b1bdecd703879ca09bf63bf1453a70c4b80ac96d.zip | |
Merge branch 'ntor-resquashed'
Conflicts:
src/or/cpuworker.c
src/or/or.h
src/test/bench.c
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 60866218c5..9905a94fda 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -390,6 +390,7 @@ static config_var_t option_vars_[] = { V(UseEntryGuards, BOOL, "1"), V(UseEntryGuardsAsDirGuards, BOOL, "1"), V(UseMicrodescriptors, AUTOBOOL, "auto"), + V(UseNTorHandshake, AUTOBOOL, "auto"), V(User, STRING, NULL), V(UserspaceIOCPBuffers, BOOL, "0"), VAR("V1AuthoritativeDirectory",BOOL, V1AuthoritativeDir, "0"), |