Merge remote-tracking branch 'public/ticket18319'

This commit is contained in:
Nick Mathewson
2017-01-21 14:44:00 -05:00
3 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -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"),