commit 1f347f33b2e6e2c5f18cb0658b4c5f77e870a280 Author: Damian Johnson atagar@torproject.org Date: Sat Oct 15 16:18:17 2011 -0700
Skip validation warnings for DirReqStatistics
In new tor versions the DirReqStatistics is enabled by default and disabled when geoip lookups are unavailable. This casuses arm to warn that the torrc differs from tor's state. Discarding this validation warning instead. Tested by checking that validation didn't complain when I SETCONF this option. Caught by Sebastian.
https://trac.torproject.org/projects/tor/ticket/4237 --- src/util/torConfig.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 51bb656..477ad9e 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -580,6 +580,14 @@ def validate(contents = None):
# checks if any custom options are missing from the torrc for option in customOptions: + # In new versions the 'DirReqStatistics' option is true by default and + # disabled on startup if geoip lookups are unavailable. If this option is + # missing then that's most likely the reason. + # + # https://trac.torproject.org/projects/tor/ticket/4237 + + if option == "DirReqStatistics": continue + if not option in seenOptions: issuesFound.append((None, ValidationError.MISSING, option))