diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-01-21 14:44:00 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-01-21 14:44:00 -0500 |
| commit | e52f49aa800019d3f60b640f5bb82ef7cf5f78e5 (patch) | |
| tree | 70dccb7e70e94e584ebbea38742c0138ff57a812 /src/or/config.c | |
| parent | 9023d7361d13629e0bc3de081db974a870d306b0 (diff) | |
| parent | 0dd48bfe5aab9ca213dfbacd3b2ee8710a584405 (diff) | |
| download | tor-e52f49aa800019d3f60b640f5bb82ef7cf5f78e5.tar.gz tor-e52f49aa800019d3f60b640f5bb82ef7cf5f78e5.zip | |
Merge remote-tracking branch 'public/ticket18319'
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 f885cbca3b..2c239a5e34 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -212,7 +212,7 @@ static config_var_t option_vars_[] = { V(AuthDirInvalidCCs, CSV, ""), V(AuthDirFastGuarantee, MEMUNIT, "100 KB"), V(AuthDirGuardBWGuarantee, MEMUNIT, "2 MB"), - V(AuthDirPinKeys, BOOL, "0"), + V(AuthDirPinKeys, BOOL, "1"), V(AuthDirReject, LINELIST, NULL), V(AuthDirRejectCCs, CSV, ""), OBSOLETE("AuthDirRejectUnlisted"), |