diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-08 16:49:24 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-08 16:49:24 -0500 |
| commit | e93234af70da5cf3d513e57b12e4934b1c4d9529 (patch) | |
| tree | e8c72b7f9a1cbbedd154444bdb23b54c051c48ea /src/or/config.c | |
| parent | e33c85a450c4819cdad30acfc280aece7c521d6e (diff) | |
| parent | 236e8b605e6aebf87787951ca05f5c75ad530c8a (diff) | |
| download | tor-e93234af70da5cf3d513e57b12e4934b1c4d9529.tar.gz tor-e93234af70da5cf3d513e57b12e4934b1c4d9529.zip | |
Merge branch 'feature15056_v1_squashed'
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 81be2a4b3a..6948bdbdb4 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -305,6 +305,7 @@ static config_var_t option_vars_[] = { V(ExtORPortCookieAuthFile, STRING, NULL), V(ExtORPortCookieAuthFileGroupReadable, BOOL, "0"), V(ExtraInfoStatistics, BOOL, "1"), + V(ExtendByEd25519ID, AUTOBOOL, "auto"), V(FallbackDir, LINELIST, NULL), V(UseDefaultFallbackDirs, BOOL, "1"), @@ -497,6 +498,7 @@ static config_var_t option_vars_[] = { V(User, STRING, NULL), OBSOLETE("UserspaceIOCPBuffers"), V(AuthDirSharedRandomness, BOOL, "1"), + V(AuthDirTestEd25519LinkKeys, BOOL, "1"), OBSOLETE("V1AuthoritativeDirectory"), OBSOLETE("V2AuthoritativeDirectory"), VAR("V3AuthoritativeDirectory",BOOL, V3AuthoritativeDir, "0"), |