commit two fixes from Thomas Themel

svn:r1918

diff --git a/src/or/config.c b/src/or/config.c
index c3dc7c58a4431d382b2ddab9eac3745667223258..332a6e009f423dabf40b98824811611bb3523b66 100644 (file)
--- 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 46238f2cfa5dfa7c764239b4ef830a00bd763933..7d46e902aa59a34a0ad335881ee4597e412d30dd 100644 (file)
--- 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. */