summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-09-23 10:44:38 -0400
committerNick Mathewson <nickm@torproject.org>2015-09-23 11:02:21 -0400
commitc5e87e33c7a3bf0f3d6b289814d303bcb4c63fe2 (patch)
tree697388196be5e2808ccfec0ec6096d99cf049009 /src/or/config.c
parent81724d5a001575e3f25da665b8bdedf287ace765 (diff)
downloadtor-c5e87e33c7a3bf0f3d6b289814d303bcb4c63fe2.tar.gz
tor-c5e87e33c7a3bf0f3d6b289814d303bcb4c63fe2.zip
Allow conflicts to occur in keypinning journal
When we find a conflict in the keypinning journal, treat the new entry as superseding all old entries that overlap either of its keys. Also add a (not-yet-used) configuration option to disable keypinning enforcement.
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 44fb4ecec6..fa860af337 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -162,6 +162,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(AuthDirReject, LINELIST, NULL),
V(AuthDirRejectCCs, CSV, ""),
OBSOLETE("AuthDirRejectUnlisted"),