diff options
author | Nick Mathewson <nickm@torproject.org> | 2021-03-15 08:54:00 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2021-03-15 08:54:00 -0400 |
commit | cfeb063f2462ef374a77d38c39a14b88255dc8a5 (patch) | |
tree | fc84ce85ddae4c7f127a23646fcc380007ffcecf /src/feature | |
parent | efb174df242adf964e383381d31b891c5f535f1f (diff) | |
parent | a6533af9e8d90fda13180064e98b49ac3c3cdf86 (diff) | |
download | tor-cfeb063f2462ef374a77d38c39a14b88255dc8a5.tar.gz tor-cfeb063f2462ef374a77d38c39a14b88255dc8a5.zip |
Merge branch 'maint-0.4.5'
Diffstat (limited to 'src/feature')
-rw-r--r-- | src/feature/dirparse/unparseable.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/feature/dirparse/unparseable.c b/src/feature/dirparse/unparseable.c index 9098bfa4e0..930717a6ff 100644 --- a/src/feature/dirparse/unparseable.c +++ b/src/feature/dirparse/unparseable.c @@ -498,8 +498,11 @@ dump_desc,(const char *desc, const char *type)) tor_assert(desc); tor_assert(type); #ifndef TOR_UNIT_TESTS - /* On older versions of Tor we are disabling this function, since it - * can be called with strings that are far too long. */ + /* For now, we are disabling this function, since it can be called with + * strings that are far too long. We can turn it back on if we fix it + * someday, but we'd need to give it a length argument. A likelier + * resolution here is simply to remove this module entirely. See tor#40286 + * for background. */ if (1) return; #endif |