| commit | c5e87e33c7a3bf0f3d6b289814d303bcb4c63fe2 | |
| author | Nick Mathewson <nickm@torproject.org> | |
| Wed, 23 Sep 2015 14:44:38 +0000 (23 10:44 -0400) | ||
| committer | Nick Mathewson <nickm@torproject.org> | |
| Wed, 23 Sep 2015 15:02:21 +0000 (23 11:02 -0400) | ||
| tree | 697388196be5e2808ccfec0ec6096d99cf049009 | treesnapshot (tar.gz zip) |
| parent | 81724d5a001575e3f25da665b8bdedf287ace765 | commitdiff |
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.
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.
| src/or/config.c | diffblobblamehistory | |
| src/or/keypin.c | diffblobblamehistory | |
| src/or/or.h | diffblobblamehistory | |
| src/test/test_keypin.c | diffblobblamehistory |