commit 786a8549c556f962c5c1dd4f54ef90e1cfc23d21 Merge: fc7008f 044168b Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 13 10:48:20 2012 -0500
Merge remote-tracking branch 'karsten/noticelogs'
Conflicts: src/main.c
doc/HACKING | 4 ++-- src/main.c | 12 +++++++----- src/util.c | 32 ++++++++++++++++++++++++-------- src/util.h | 12 +++++++++--- 4 files changed, 42 insertions(+), 18 deletions(-)
diff --cc src/main.c index 31878f9,6540ab0..1d7132d --- a/src/main.c +++ b/src/main.c @@@ -53,9 -51,9 +53,10 @@@ usage(void fprintf(stderr,"[%s] ", supported_protocols[i]->name); fprintf(stderr, "\n* obfsproxy_args:\n" "--log-file=<file> ~ set logfile\n" - "--log-min-severity=warn|info|debug ~ set minimum logging severity\n" + "--log-min-severity=warn|notice|info|debug ~ " + "set minimum logging severity (default: notice)\n" - "--no-log ~ disable logging\n"); + "--no-log ~ disable logging\n" + "--no-safe-logging ~ disable safe (scrubbed address) logging\n");
exit(1); }