diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-08-29 15:02:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-08-29 15:02:11 -0400 |
| commit | bbaa7d09a045130560a2f5da579671c5e02c9cd7 (patch) | |
| tree | 232540453f40eb00b2dc0492b236967f383627e8 /src/or/config.c | |
| parent | f46ce6e3d8bea3cf00388c87c29cdcafd4bab350 (diff) | |
| parent | 19816f2f782568722964d35ee132af441a809db3 (diff) | |
| download | tor-bbaa7d09a045130560a2f5da579671c5e02c9cd7.tar.gz tor-bbaa7d09a045130560a2f5da579671c5e02c9cd7.zip | |
Merge remote-tracking branch 'teor/reject-tap-v6'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 31bf81877d..6ab2fd8116 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -438,7 +438,7 @@ static config_var_t option_vars_[] = { V(UseEntryGuardsAsDirGuards, BOOL, "1"), V(UseGuardFraction, AUTOBOOL, "auto"), V(UseMicrodescriptors, AUTOBOOL, "auto"), - V(UseNTorHandshake, AUTOBOOL, "1"), + OBSOLETE("UseNTorHandshake"), V(User, STRING, NULL), OBSOLETE("UserspaceIOCPBuffers"), V(AuthDirSharedRandomness, BOOL, "1"), |