Commit 994c9cbd authored by Roger Dingledine's avatar Roger Dingledine
Browse files

commit two fixes from Thomas Themel 


svn:r1918
parent f875db18

src/or/config.c

+1 −1
Original line number Diff line number Diff line
@@ -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) ||

src/or/or.h

+0 −2
Original line number Diff line number Diff line
@@ -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. */