diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-05-01 10:43:40 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-05-01 10:43:40 -0400 |
| commit | 9ece027d6065e09743ac875aa873bf23583c133f (patch) | |
| tree | f7afbdff3e7c62f76a155febd9ce970876bccbc9 /src/or/dirserv.c | |
| parent | d018bf199c9e566202eef0bb7fb68c2567c4a25e (diff) | |
| parent | 6ed2ad0f0031f011591837a44533d5b196a51e37 (diff) | |
| download | tor-9ece027d6065e09743ac875aa873bf23583c133f.tar.gz tor-9ece027d6065e09743ac875aa873bf23583c133f.zip | |
Merge remote-tracking branch 'ffmancera-1/bug20522'
Diffstat (limited to 'src/or/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index e7b55b152b..f3a774018e 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -259,11 +259,12 @@ dirserv_load_fingerprint_file(void) * identity to stop doing so. This is going to be essential for good identity * security: otherwise anybody who can attack RSA-1024 but not Ed25519 could * just sign fake descriptors missing the Ed25519 key. But we won't actually - * be able to prevent that kind of thing until we're confident that there - * isn't actually a legit reason to downgrade to 0.2.5. So for now, we have - * to leave this #undef. + * be able to prevent that kind of thing until we're confident that there isn't + * actually a legit reason to downgrade to 0.2.5. Now we are not recommending + * 0.2.5 anymore so there is no reason to keep the #undef. */ -#undef DISABLE_DISABLING_ED25519 + +#define DISABLE_DISABLING_ED25519 /** Check whether <b>router</b> has a nickname/identity key combination that * we recognize from the fingerprint list, or an IP we automatically act on |