diff options
| author | Andrew Lewman <andrew@torproject.org> | 2007-01-13 05:09:09 +0000 |
|---|---|---|
| committer | Andrew Lewman <andrew@torproject.org> | 2007-01-13 05:09:09 +0000 |
| commit | 930e12920d13930692c5df6869ad2003849a6863 (patch) | |
| tree | 1f74ff2e447011c22e504cf729a3672a087923be | |
| parent | 60128145e2440d122fe0f0dee44d44eab5696069 (diff) | |
| download | tor-930e12920d13930692c5df6869ad2003849a6863.tar tor-930e12920d13930692c5df6869ad2003849a6863.tar.gz | |
Update copyright in config.c while I'm there. Update man page to
reflect all available options to tor binary.
svn:r9341
| -rw-r--r-- | doc/tor.1.in | 24 | ||||
| -rw-r--r-- | src/or/config.c | 2 |
2 files changed, 25 insertions, 1 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index 18e6dfd87..35fc8ec1f 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -26,6 +26,30 @@ Display a short help message and exit. FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc) .LP .TP +\fB--hash-password\fP +Generates a hashed password for control port access. +.LP +.TP +\fB--list-fingerprint\fP +Generate your keys and output your nickname and fingerprint. +.LP +.TP +\fB--verify-config\fP +Verify the configuration file is valid. +.LP +.TP +\fB--nt-servce\fP +Create a service of Tor under Win32 operating systems. +.LP +.TP +\fB--list-torrc-options\fP +List all valid options. +.LP +.TP +\fB--version\fP +Display Tor version. +.LP +.TP Other options can be specified either on the command-line (\fI--option value\fR), or in the configuration file (\fIoption value\fR). Options are case-insensitive. diff --git a/src/or/config.c b/src/or/config.c index 70b981bd7..32b707ed5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1,6 +1,6 @@ /* Copyright (c) 2001 Matej Pfajfar. * Copyright (c) 2001-2004, Roger Dingledine. - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. */ + * Copyright (c) 2004-2007, Roger Dingledine, Nick Mathewson. */ /* See LICENSE for licensing information */ /* $Id$ */ const char config_c_id[] = \ |