[or-cvs] commit two fixes from Thomas Themel

[Roger Dingledine]

Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	config.c or.h 
Log Message:
commit two fixes from Thomas Themel


Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- config.c	20 May 2004 19:47:28 -0000	1.119
+++ config.c	22 May 2004 18:05:20 -0000	1.120
@@ -200,7 +200,7 @@
 
     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) ||

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -d -r1.356 -r1.357
--- or.h	20 May 2004 19:47:28 -0000	1.356
+++ or.h	22 May 2004 18:05:20 -0000	1.357
@@ -761,8 +761,6 @@
   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. */