diff options
author | Roger Dingledine <arma@torproject.org> | 2004-05-22 18:05:20 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2004-05-22 18:05:20 +0000 |
commit | 994c9cbd7ec63c1a838f9c4af72baf85381f8e95 (patch) | |
tree | facc9d765c340cec94afabf95733c82f8c22446d /src/or | |
parent | f875db1821ba675c9e53ca100374403e9d0462d1 (diff) | |
download | tor-994c9cbd7ec63c1a838f9c4af72baf85381f8e95.tar tor-994c9cbd7ec63c1a838f9c4af72baf85381f8e95.tar.gz |
commit two fixes from Thomas Themel
svn:r1918
Diffstat (limited to 'src/or')
-rw-r--r-- | src/or/config.c | 2 | ||||
-rw-r--r-- | src/or/or.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index c3dc7c58a..332a6e009 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -200,7 +200,7 @@ static int config_assign(or_options_t *options, struct config_line_t *list) { config_compare(list, "ExitNodes", CONFIG_TYPE_STRING, &options->ExitNodes) || config_compare(list, "EntryNodes", CONFIG_TYPE_STRING, &options->EntryNodes) || - config_compare(list, "ExitPolicy", CONFIG_TYPE_STRING, &options->ExitPolicy) || + config_compare(list, "ExitPolicy", CONFIG_TYPE_LINELIST, &options->ExitPolicy) || config_compare(list, "ExcludeNodes", CONFIG_TYPE_STRING, &options->ExcludeNodes) || config_compare(list, "Group", CONFIG_TYPE_STRING, &options->Group) || diff --git a/src/or/or.h b/src/or/or.h index 46238f2cf..7d46e902a 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -761,8 +761,6 @@ typedef struct { struct config_line_t *LogOptions; /**< List of configuration lines * for logfiles */ - char *LogLevel; /**< Verbosity of log: minimal level of messages to report. */ - char *LogFile; /**< Where to send normal log messages. */ char *DebugLogFile; /**< Where to send verbose log messages. */ char *DataDirectory; /**< OR only: where to store long-term data. */ char *RouterFile; /**< Where to find starting list of ORs. */ |